Ticket #17189: 17189.patch

django/contrib/auth/admin.py

@@ -11 +11 @@
 from django.template.response import TemplateResponse
 from django.utils.html import escape
 from django.utils.decorators import method_decorator
+from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext, ugettext_lazy as _
 from django.views.decorators.csrf import csrf_protect
 from django.views.decorators.debug import sensitive_post_parameters
@@ -113 +114 @@
                                                extra_context)
 
     @sensitive_post_parameters()
-    def user_change_password(self, request, id):
+    def user_change_password(self, request, id, form_url=''):
         if not self.has_change_permission(request):
             raise PermissionDenied
         user = get_object_or_404(self.model, pk=id)
@@ -133 +134 @@
         context = {
             'title': _('Change password: %s') % escape(user.username),
             'adminForm': adminForm,
+            'form_url': mark_safe(form_url),
             'form': form,
             'is_popup': '_popup' in request.REQUEST,
             'add': True,

django/contrib/auth/fixtures/authtestdata.json

@@ -52 +52 @@
             "email": "staffmember@example.com", 
             "date_joined": "2006-12-17 07:03:31"
         }
+    },
+    {
+        "pk": "4", 
+        "model": "auth.user", 
+        "fields": {
+            "username": "superuser", 
+            "first_name": "Superuser", 
+            "last_name": "Member", 
+            "is_active": true, 
+            "is_superuser": true, 
+            "is_staff": true, 
+            "last_login": "2006-12-17 07:03:31", 
+            "groups": [], 
+            "user_permissions": [], 
+            "password": "sha1$6efc0$f93efe9fd7542f25a7be94871ea45aa95de57161", 
+            "email": "superusermember@example.com", 
+            "date_joined": "2006-12-17 07:03:31"
+        }
     }
 ]

django/contrib/auth/tests/urls.py

@@ -1 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import patterns, url, include
 from django.contrib.auth import context_processors
 from django.contrib.auth.urls import urlpatterns
 from django.contrib.auth.views import password_reset
@@ -9 +9 @@
 from django.template import Template, RequestContext
 from django.views.decorators.cache import never_cache
 
+from django.contrib import admin
+admin.autodiscover()
+
 @never_cache
 def remote_user_auth_view(request):
     "Dummy view for remote user tests"
@@ -60 +63 @@
     (r'^auth_processor_perms/$', auth_processor_perms),
     (r'^auth_processor_messages/$', auth_processor_messages),
     url(r'^userpage/(.+)/$', userpage, name="userpage"),
+    url(r'^admin/', include(admin.site.urls))
 )
 

django/contrib/auth/tests/views.py

@@ -183 +183 @@
 
 class ChangePasswordTest(AuthViewsTestCase):
 
+    def test_form_url_present_in_context(self, password='password'):
+        response = self.client.post('/login/', {
+            'username': 'superuser',
+            'password': password,
+        })
+
+        response = self.client.get('/admin/auth/user/4/password/')
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue('form_url' in response.context, msg = 'form_url not present in response context')
+
     def fail_login(self, password='password'):
         response = self.client.post('/login/', {
             'username': 'testclient',