Ticket #16958: patch_1_admin_password_change_limited.diff

django/contrib/auth/admin.py

@@ -108 +108 @@
     def user_change_password(self, request, id):
         if not self.has_change_permission(request):
             raise PermissionDenied
-        user = get_object_or_404(self.model, pk=id)
+        user = get_object_or_404(self.queryset(request), pk=id)
         if request.method == 'POST':
             form = self.change_password_form(user, request.POST)
             if form.is_valid():

tests/regressiontests/admin_views/tests.py

@@ -2951 +2951 @@
             response = self.client.get('/test_admin/admin/auth/user/%s/' % u.pk)
             self.assertEqual(response.status_code, 200)
 
+    def test_user_password_change_limited_queryset(self):
+        su = User.objects.filter(is_superuser=True)[0]
+        response = self.client.get('/test_admin/admin2/auth/user/%s/password/' % su.pk)
+        self.assertEquals(response.status_code, 404)
+
 
 class GroupAdminTest(TestCase):
     """

tests/regressiontests/admin_views/customadmin.py

@@ -5 +5 @@
 from django.contrib import admin
 from django.http import HttpResponse
+import django.contrib.auth.models
+import django.contrib.auth.admin
 
 import models, forms, admin as base_admin
 
@@ -27 +28 @@
     def my_view(self, request):
         return HttpResponse("Django is a magical pony!")
 
+class UserLimitedAdmin(django.contrib.auth.admin.UserAdmin):
+    # used for testing password change on a user not in queryset
+    def queryset(self, request):
+        qs = super(UserLimitedAdmin, self).queryset(request)
+        return qs.filter(is_superuser=False)
+
 site = Admin2(name="admin2")
 
 site.register(models.Article, base_admin.ArticleAdmin)
@@ -34 +41 @@
 site.register(models.Thing, base_admin.ThingAdmin)
 site.register(models.Fabric, base_admin.FabricAdmin)
 site.register(models.ChapterXtra1, base_admin.ChapterXtra1Admin)
+site.register(django.contrib.auth.models.User, UserLimitedAdmin)