Merge pull request #1436 from opengisch/redirect-logout-view

feat: override Django admin logout view to redirect to Allauth's logout

Author: toebivankenoebi

docker-app/qfieldcloud/core/admin.py

@@ -25,7 +25,7 @@
 from django.contrib.admin.templatetags.admin_urls import admin_urlname
 from django.contrib.admin.views.main import ChangeList
 from django.contrib.auth.models import Group
-from django.contrib.auth.views import redirect_to_login
+from django.contrib.auth.views import logout_then_login, redirect_to_login
 from django.core.exceptions import PermissionDenied, ValidationError
 from django.core.files.storage import storages
 from django.db.models import Q, QuerySet
@@ -101,6 +101,12 @@ def login(
             request.GET.get("next", ""), login_url=reverse(settings.LOGIN_URL)
         )
 
+    def logout(  # type: ignore[override]
+        self, request: HttpRequest, extra_context: dict[str, Any] | None = None
+    ) -> HttpResponse:
+        """Override the default Django admin logout view to redirect to the Allauth's logout view."""
+        return logout_then_login(request)
+
     # TODO consider adding a logout view to redirect to the Allauth's logout view, but then we lose the nice template we have right now.
 
 

docker-app/qfieldcloud/core/staticfiles/css/admin.css

@@ -1,7 +1,3 @@
-.login-logo img {
-    width: 100%;
-}
-
 .object-tools{
     margin-bottom: 1rem;
 }