Ticket #15755: admin.diff

conf/global_settings.py

@@ -484 +484 @@
 # The number of days a password reset link is valid for
 PASSWORD_RESET_TIMEOUT_DAYS = 3
 
+# Whether the admin app should handle user authentication.
+ADMIN_HANDLE_LOGINS = True
+
 ########
 # CSRF #
 ########

contrib/admin/sites.py

@@ -7 +7 @@
 from django.contrib.contenttypes import views as contenttype_views
 from django.views.decorators.csrf import csrf_protect
 from django.db.models.base import ModelBase
-from django.core.exceptions import ImproperlyConfigured
+from django.core.exceptions import ImproperlyConfigured, PermissionDenied
 from django.core.urlresolvers import reverse
 from django.shortcuts import render_to_response
 from django.utils.safestring import mark_safe
@@ -193 +193 @@
         """
         def inner(request, *args, **kwargs):
             if not self.has_permission(request):
-                return self.login(request)
+                if settings.ADMIN_HANDLE_LOGINS:
+                    return self.login(request)
+                else:
+                    raise PermissionDenied
             return view(request, *args, **kwargs)
         if not cacheable:
             inner = never_cache(inner)