Changeset 6206

Timestamp:

09/14/07 14:25:37 (1 year ago)

Author:

adrian

Message:

Fixed #5394 -- REDIRECT_FIELD_NAME is now configurable. Thanks, Petr Marhoun, DavidReynolds? and effbot

Files:

• django/trunk/django/contrib/auth/decorators.py (modified) (3 diffs)
• django/trunk/django/contrib/auth/views.py (modified) (3 diffs)
• django/trunk/docs/authentication.txt (modified) (1 diff)
• django/trunk/tests/modeltests/test_client/models.py (modified) (1 diff)
• django/trunk/tests/modeltests/test_client/urls.py (modified) (1 diff)
• django/trunk/tests/modeltests/test_client/views.py (modified) (1 diff)

django/trunk/django/contrib/auth/decorators.py

@@ -3 +3 @@
-from urllib import quote
-
-
+, redirect_field_name=REDIRECT_FIELD_NAME
-    """
-    Decorator for views that checks that the user passes the given test,
@@ -16 +16 @@
-            if test_func(request.user):
-                return view_func(request, *args, **kwargs)
-REDIRECT_FIELD_NAME
+redirect_field_name
-        _checklogin.__doc__ = view_func.__doc__
-        _checklogin.__dict__ = view_func.__dict__
@@ -23 +23 @@
-    return _dec
-
-
-
+
-    """
-    Decorator for views that checks that the user is logged in, redirecting
-    to the log-in page if necessary.
-    """
+    actual_decorator = user_passes_test(
+        lambda u: u.is_authenticated(),
+        redirect_field_name=redirect_field_name
-    )
+    if function:
+        return actual_decorator(function)
+    return actual_decorator
-
-def permission_required(perm, login_url=None):

django/trunk/django/contrib/auth/views.py

@@ -10 +10 @@
-from django.utils.translation import ugettext as _
-
-
+, redirect_field_name=REDIRECT_FIELD_NAME
-    "Displays the login form and handles the login action."
-    manipulator = AuthenticationForm(request)
-REDIRECT_FIELD_NAME
+redirect_field_name
-    if request.POST:
-        errors = manipulator.get_validation_errors(request.POST)
@@ -36 +36 @@
-    return render_to_response(template_name, {
-        'form': oldforms.FormWrapper(manipulator, request.POST, errors),
-REDIRECT_FIELD_NAME
+redirect_field_name
-        'site_name': current_site.name,
-    }, context_instance=RequestContext(request))
@@ -57 +57 @@
-    return logout(request, login_url)
-
-
+, redirect_field_name=REDIRECT_FIELD_NAME
-    "Redirects the user to the login page, passing the given 'next' page"
-    if not login_url:
-        from django.conf import settings
-        login_url = settings.LOGIN_URL
-REDIRECT_FIELD_NAME
+redirect_field_name
-
-def password_reset(request, is_admin_site=False, template_name='registration/password_reset_form.html',

django/trunk/docs/authentication.txt

@@ -403 +403 @@
-        # ...
-
+In the Django development version, ``login_required`` also takes an optional
+``redirect_field_name`` parameter. Example::
+    
+    from django.contrib.auth.decorators import login_required
+
+    def my_view(request):
+        # ...
+    my_view = login_required(redirect_field_name='redirect_to')(my_view)
+
+Again, an equivalent example of the more compact decorator syntax introduced in Python 2.4::
+    
+    from django.contrib.auth.decorators import login_required
+
+    @login_required(redirect_field_name='redirect_to')
+    def my_view(request):
+        # ...
+
-``login_required`` does the following:
-
-    * If the user isn't logged in, redirect to ``settings.LOGIN_URL``
-      (``/accounts/login/`` by default), passing the current absolute URL
-
+
+
-      ``/accounts/login/?next=/polls/3/``.
-    * If the user is logged in, execute the view normally. The view code is

django/trunk/tests/modeltests/test_client/models.py

@@ -251 +251 @@
-        self.assertEqual(response.context['user'].username, 'testclient')
-
+    def test_view_with_login_and_custom_redirect(self):
+        "Request a page that is protected with @login_required(redirect_field_name='redirect_to')"
+        
+        # Get the page without logging in. Should result in 302.
+        response = self.client.get('/test_client/login_protected_view_custom_redirect/')
+        self.assertRedirects(response, 'http://testserver/accounts/login/?redirect_to=/test_client/login_protected_view_custom_redirect/')
+
+        # Log in
+        login = self.client.login(username='testclient', password='password')
+        self.failUnless(login, 'Could not log in')
+
+        # Request a page that requires a login
+        response = self.client.get('/test_client/login_protected_view_custom_redirect/')
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context['user'].username, 'testclient')
+
-    def test_view_with_bad_login(self):
-        "Request a page that is protected with @login, but use bad credentials"

django/trunk/tests/modeltests/test_client/urls.py

@@ -14 +14 @@
-    (r'^form_view_with_template/$', views.form_view_with_template),
-    (r'^login_protected_view/$', views.login_protected_view),
+    (r'^login_protected_view_custom_redirect/$', views.login_protected_view_changed_redirect),
-    (r'^session_view/$', views.session_view),
-    (r'^broken_view/$', views.broken_view),

django/trunk/tests/modeltests/test_client/views.py

@@ -123 +123 @@
-login_protected_view = login_required(login_protected_view)
-
+def login_protected_view_changed_redirect(request):
+    "A simple view that is login protected with a custom redirect field set"
+    t = Template('This is a login protected test. Username is {{ user.username }}.', name='Login Template')
+    c = Context({'user': request.user})
+    
+    return HttpResponse(t.render(c))
+login_protected_view_changed_redirect = login_required(redirect_field_name="redirect_to")(login_protected_view_changed_redirect)
+
-def session_view(request):
-    "A view that modifies the session"