From 9f1564edf33912b9ac75b4564630260490e1720c Mon Sep 17 00:00:00 2001 From: jbdoderlein Date: Sat, 10 Aug 2024 17:30:16 +0000 Subject: [PATCH] Add logout + Viewset name problem from migration --- apps/member/views.py | 3 +++ apps/note/api/urls.py | 2 +- note_kfet/urls.py | 11 ++++------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/member/views.py b/apps/member/views.py index 07cb620..2b7a1a1 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -47,6 +47,9 @@ class CustomLoginView(LoginView): self.request.session['permission_mask'] = 42#form.cleaned_data['permission_mask'].rank return super().form_valid(form) +def logout_view(request): + logout(request) + return redirect('index') class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): """ diff --git a/apps/note/api/urls.py b/apps/note/api/urls.py index d15e824..8e3b184 100644 --- a/apps/note/api/urls.py +++ b/apps/note/api/urls.py @@ -13,7 +13,7 @@ def register_note_urls(router, path): router.register(path + '/note', NotePolymorphicViewSet) router.register(path + '/alias', AliasViewSet) router.register(path + '/trust', TrustViewSet) - router.register(path + '/consumer', ConsumerViewSet) + router.register(path + '/consumer', ConsumerViewSet,"consumer") router.register(path + '/transaction/category', TemplateCategoryViewSet) router.register(path + '/transaction/transaction', TransactionViewSet) diff --git a/note_kfet/urls.py b/note_kfet/urls.py index 5a4a0a3..a9d0b84 100644 --- a/note_kfet/urls.py +++ b/note_kfet/urls.py @@ -3,13 +3,15 @@ from django.conf import settings from django.conf.urls.static import static +import django.contrib.auth.views from django.urls import path, include from django.views.defaults import bad_request, permission_denied, page_not_found, server_error -from member.views import CustomLoginView +from member.views import CustomLoginView, logout_view from .admin import admin_site from .views import IndexView + urlpatterns = [ # Dev so redirect to something random path('', IndexView.as_view(), name='index'), @@ -26,6 +28,7 @@ urlpatterns = [ path('admin/doc/', include('django.contrib.admindocs.urls')), path('admin/', admin_site.urls, name="admin"), path('accounts/login/', CustomLoginView.as_view()), + path('accounts/logout/', logout_view), path('accounts/', include('django.contrib.auth.urls')), path('api/', include('api.urls')), path('permission/', include('permission.urls')), @@ -47,12 +50,6 @@ if "cas_server" in settings.INSTALLED_APPS: path('cas/', include('cas_server.urls', namespace='cas_server')) ) -if "debug_toolbar" in settings.INSTALLED_APPS: - import debug_toolbar - urlpatterns = [ - path('__debug__/', include(debug_toolbar.urls)), - ] + urlpatterns - handler400 = bad_request handler403 = permission_denied