Ticket #9881: patch-9881.diff

django/contrib/auth/views.py

@@ -1 +1 @@
 from django.conf import settings
-from django.contrib.auth import REDIRECT_FIELD_NAME
+from django.contrib.auth import REDIRECT_FIELD_NAME, SITE_KEYWORD
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth.forms import PasswordResetForm, SetPasswordForm, PasswordChangeForm
@@ -38 +38 @@
     return render_to_response(template_name, {
         'form': form,
         redirect_field_name: redirect_to,
-        'site_name': current_site.name,
+        'site_name': current_site.name, # do not remove for backward compatibility
+        SITE_KEYWORD: current_site,
     }, context_instance=RequestContext(request))
 login = never_cache(login)
 

django/contrib/auth/__init__.py

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

django/contrib/auth/tests/views.py

@@ -3 +3 @@
 import re
 
 from django.conf import settings
+from django.contrib.sites.models import Site, RequestSite
 from django.contrib.auth.models import User
+from django.contrib.auth.views import login as login_view, SITE_KEYWORD
 from django.test import TestCase
 from django.core import mail
+from django.core.urlresolvers import reverse
 
 class PasswordResetTest(TestCase):
     fixtures = ['authtestdata.json']
@@ -162 +165 @@
         self.fail_login()
         self.login(password='password1')
 
+class LoginTest(TestCase):
+    fixtures = ['authtestdata.json']
+    urls = 'django.contrib.auth.urls'
+
+    def setUp(self):
+        self.old_TEMPLATE_DIRS = settings.TEMPLATE_DIRS
+        settings.TEMPLATE_DIRS = (os.path.join(os.path.dirname(__file__), 'templates'),)
+
+    def tearDown(self):
+        settings.TEMPLATE_DIRS = self.old_TEMPLATE_DIRS
+
+    def test_current_site_in_context_after_login(self):
+        response = self.client.get(reverse(login_view))
+        self.assertEquals(response.status_code, 200)
+        self.assertTrue(SITE_KEYWORD in response.context)
+
+        if Site._meta.installed:
+            current_site = Site.objects.get_current()
+        else:
+            current_site = RequestSite(request)
+
+        self.assertEquals(current_site, response.context[SITE_KEYWORD])

django/contrib/auth/tests/__init__.py

@@ -1 +1 @@
 from django.contrib.auth.tests.basic import BASIC_TESTS
 from django.contrib.auth.tests.views \
-        import PasswordResetTest, ChangePasswordTest
+        import PasswordResetTest, ChangePasswordTest, LoginTest
 from django.contrib.auth.tests.forms import FORM_TESTS
 from django.contrib.auth.tests.remote_user \
         import RemoteUserTest, RemoteUserNoCreateTest, RemoteUserCustomTest
@@ -14 +14 @@
     'FORM_TESTS': FORM_TESTS,
     'TOKEN_GENERATOR_TESTS': TOKEN_GENERATOR_TESTS,
     'CHANGEPASSWORD_TESTS': ChangePasswordTest,
+    'LOGIN_TESTS': LoginTest,
 }