Commit 5acf203d authored by Tim Graham's avatar Tim Graham
Browse files

Fixed #25596 -- Fixed regression in password change view with custom user model. 

The reverse() added in 50aa1a79
crashed on a custom user model.
parent 1f07da3e

django/contrib/auth/admin.py

+3 −2
Original line number Diff line number Diff line
@@ -148,8 +148,9 @@ class UserAdmin(admin.ModelAdmin): 
                update_session_auth_hash(request, form.user)

                return HttpResponseRedirect(

                    reverse(

                        '%s:auth_%s_change' % (

                        '%s:%s_%s_change' % (

                            self.admin_site.name,

                            user._meta.app_label,

                            user._meta.model_name,

                        ),

                        args=(user.pk,),
@@ -178,7 +179,7 @@ class UserAdmin(admin.ModelAdmin): 
            'save_as': False,

            'show_save': True,

        }

        context.update(admin.site.each_context(request))

        context.update(self.admin_site.each_context(request))



        request.current_app = self.admin_site.name

tests/auth_tests/models/uuid_pk.py

+0 −3
Original line number Diff line number Diff line
@@ -8,6 +8,3 @@ with RemoveGroupsAndPermissions(): 
    class UUIDUser(AbstractUser):

        """A user with a UUID as primary key"""

        id = models.UUIDField(default=uuid.uuid4, primary_key=True)
 


        class Meta:

            app_label = 'auth'

tests/auth_tests/test_auth_backends.py

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ class CustomUserModelBackendAuthenticateTest(TestCase): 
        self.assertEqual(test_user, authenticated_user)





@override_settings(AUTH_USER_MODEL='auth.UUIDUser')

@override_settings(AUTH_USER_MODEL='auth_tests.UUIDUser')

class UUIDUserTests(TestCase):



    def test_login(self):

tests/auth_tests/test_views.py

+3 −3
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ class CustomUserPasswordResetTest(AuthViewsTestCase): 
        self.assertRedirects(response, '/reset/done/')





@override_settings(AUTH_USER_MODEL='auth.UUIDUser')

@override_settings(AUTH_USER_MODEL='auth_tests.UUIDUser')

class UUIDUserPasswordResetTest(CustomUserPasswordResetTest):



    def _test_confirm_start(self):
@@ -991,7 +991,7 @@ class ChangelistTests(AuthViewsTestCase): 




@override_settings(

    AUTH_USER_MODEL='auth.UUIDUser',

    AUTH_USER_MODEL='auth_tests.UUIDUser',

    ROOT_URLCONF='auth_tests.urls_custom_user_admin',

)

class UUIDUserTests(TestCase):
@@ -1000,7 +1000,7 @@ class UUIDUserTests(TestCase): 
        u = UUIDUser.objects.create_superuser(username='uuid', email='foo@bar.com', password='test')

        self.assertTrue(self.client.login(username='uuid', password='test'))



        user_change_url = reverse('custom_user_admin:auth_uuiduser_change', args=(u.pk,))

        user_change_url = reverse('custom_user_admin:auth_tests_uuiduser_change', args=(u.pk,))

        response = self.client.get(user_change_url)

        self.assertEqual(response.status_code, 200)