Ticket #5394: configurable-redirect-field-name.diff

django/conf/global_settings.py

@@ -328 +328 @@
-
-LOGIN_REDIRECT_URL = '/accounts/profile/'
-
+REDIRECT_FIELD_NAME = 'next'
+
-###########
-# TESTING #
-###########

django/contrib/auth/__init__.py

@@ -3 +3 @@
-
-SESSION_KEY = '_auth_user_id'
-BACKEND_SESSION_KEY = '_auth_user_backend'
-REDIRECT_FIELD_NAME = 'next'
-
-def load_backend(path):
-    i = path.rfind('.')

django/contrib/auth/decorators.py

@@ -1 @@
-from django.contrib.auth import REDIRECT_FIELD_NAME
-from django.http import HttpResponseRedirect
-from urllib import quote
-
@@ -8 +7 @@
-    redirecting to the log-in page if necessary. The test should be a callable
-    that takes the user object and returns True if the user passes.
-    """
+    from django.conf import settings
-    if not login_url:
-        from django.conf import settings
-        login_url = settings.LOGIN_URL
-    def _dec(view_func):
-        def _checklogin(request, *args, **kwargs):
-            if test_func(request.user):
-                return view_func(request, *args, **kwargs)
-
+settings.
-        _checklogin.__doc__ = view_func.__doc__
-        _checklogin.__dict__ = view_func.__dict__
-

django/contrib/auth/views.py

@@ -6 +6 @@
-from django.contrib.sites.models import Site, RequestSite
-from django.http import HttpResponseRedirect
-from django.contrib.auth.decorators import login_required
-from django.contrib.auth import REDIRECT_FIELD_NAME
-from django.utils.translation import ugettext as _
-
-def login(request, template_name='registration/login.html'):
-    "Displays the login form and handles the login action."
-    manipulator = AuthenticationForm(request)
-
+
+
-    if request.POST:
-        errors = manipulator.get_validation_errors(request.POST)
-        if not errors:
-            # Light security check -- make sure redirect_to isn't garbage.
-            if not redirect_to or '//' in redirect_to or ' ' in redirect_to:
-                from django.conf import settings
-                redirect_to = settings.LOGIN_REDIRECT_URL
-            from django.contrib.auth import login
-            login(request, manipulator.get_user())
@@ -35 +34 @@
-
-    return render_to_response(template_name, {
-        'form': oldforms.FormWrapper(manipulator, request.POST, errors),
-
+settings.
-        'site_name': current_site.name,
-    }, context_instance=RequestContext(request))
-
@@ -61 +60 @@
-    if not login_url:
-        from django.conf import settings
-        login_url = settings.LOGIN_URL
-
+settings.
-
-def password_reset(request, is_admin_site=False, template_name='registration/password_reset_form.html',
-        email_template_name='registration/password_reset_email.html'):