Ticket #11223: views_with_tests.diff

django/contrib/auth/tests/views.py

@@ -333 +333 @@
         response = self.client.get('/logout/')
         self.assertTrue('site' in response.context)
 
+    def test_11223(self):
+        # Bug 11223
+        self.login()
+        response = self.client.get('/logout/next_page/')
+        self.assertEqual(response.status_code, 302)
+        self.assert_(response['Location'].endswith('/somewhere/'))
+
+        response = self.client.get('/logout/?next=/login/')
+        self.assertEqual(response.status_code, 302)
+        self.assert_(response['Location'].endswith('/login/'))
+        
+        self.confirm_logged_out()
+
     def test_logout_with_next_page_specified(self): 
         "Logout with next_page option given redirects to specified resource"
         self.login()

django/contrib/auth/views.py

@@ -74 +74 @@
     "Logs out the user and displays 'You are logged out' message."
     from django.contrib.auth import logout
     logout(request)
+    redirect_to = request.REQUEST.get(redirect_field_name, '')
+    if redirect_to:
+        return HttpResponseRedirect(redirect_to)
+
     if next_page is None:
-        redirect_to = request.REQUEST.get(redirect_field_name, '')
-        if redirect_to:
-            return HttpResponseRedirect(redirect_to)
-        else:
-            current_site = get_current_site(request)
-            context = {
-                'site': current_site,
-                'site_name': current_site.name,
-                'title': _('Logged out')
-            }
-            context.update(extra_context or {})
-            return render_to_response(template_name, context,
-                                      context_instance=RequestContext(request, current_app=current_app))
+        current_site = get_current_site(request)
+        context = {
+            'site': current_site,
+            'site_name': current_site.name,
+            'title': _('Logged out')
+        }
+        context.update(extra_context or {})
+        return render_to_response(template_name, context,
+                                  context_instance=RequestContext(request, current_app=current_app))
     else:
         # Redirect to this page until the session has been cleared.
         return HttpResponseRedirect(next_page or request.path)