diff options
| author | Artyom Kotovskiy <artyomkotovskiy@gmail.com> | 2026-05-05 03:06:10 -0400 |
|---|---|---|
| committer | Jacob Walls <jacobtylerwalls@gmail.com> | 2026-05-11 13:52:00 -0400 |
| commit | cb192dbb191525550f90d7cb9cff756f57e86aec (patch) | |
| tree | 441b76a8e8faafdfcb83703cad39ff4b24287804 | |
| parent | 4c3d0b99f1ee8b2f0b4aac5bfb3a786134152d41 (diff) | |
Removed hardcoded pks in AdminViewPermissionsTest.
Replaced obj.id permission checks with explicit boolean fields.
| -rw-r--r-- | tests/admin_views/admin.py | 12 | ||||
| -rw-r--r-- | tests/admin_views/models.py | 2 | ||||
| -rw-r--r-- | tests/admin_views/tests.py | 47 |
3 files changed, 40 insertions, 21 deletions
diff --git a/tests/admin_views/admin.py b/tests/admin_views/admin.py index d0448a1b64..aec0dd6af1 100644 --- a/tests/admin_views/admin.py +++ b/tests/admin_views/admin.py @@ -292,13 +292,17 @@ class ArticleAdmin2(admin.ModelAdmin): class RowLevelChangePermissionModelAdmin(admin.ModelAdmin): + # These fields aren't intended to be modified by the change form. By + # making them read-only, they don't need to be included in post data. + readonly_fields = ("can_change", "can_view") + def has_change_permission(self, request, obj=None): - """Only allow changing objects with even id number""" - return request.user.is_staff and (obj is not None) and (obj.id % 2 == 0) + """Only allow changing objects with can_change=True.""" + return request.user.is_staff and obj is not None and obj.can_change def has_view_permission(self, request, obj=None): - """Only allow viewing objects if id is a multiple of 3.""" - return request.user.is_staff and obj is not None and obj.id % 3 == 0 + """Only allow viewing objects with can_view=True.""" + return request.user.is_staff and obj is not None and obj.can_view class CustomArticleAdmin(admin.ModelAdmin): diff --git a/tests/admin_views/models.py b/tests/admin_views/models.py index 38e26cb95a..50abbfdfe2 100644 --- a/tests/admin_views/models.py +++ b/tests/admin_views/models.py @@ -128,6 +128,8 @@ class ChapterXtra2(models.Model): class RowLevelChangePermissionModel(models.Model): name = models.CharField(max_length=100, blank=True) + can_change = models.BooleanField(default=False) + can_view = models.BooleanField(default=False) class CustomArticle(models.Model): diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 8b4912cff4..a1251103aa 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -2930,10 +2930,18 @@ class AdminViewPermissionsTest(TestCase): # Test redirection when using row-level change permissions. Refs # #11513. - r1 = RowLevelChangePermissionModel.objects.create(id=1, name="odd id") - r2 = RowLevelChangePermissionModel.objects.create(id=2, name="even id") - r3 = RowLevelChangePermissionModel.objects.create(id=3, name="odd id mult 3") - r6 = RowLevelChangePermissionModel.objects.create(id=6, name="even id mult 3") + r1 = RowLevelChangePermissionModel.objects.create( + name="A", can_change=False, can_view=False + ) + r2 = RowLevelChangePermissionModel.objects.create( + name="B", can_change=True, can_view=False + ) + r3 = RowLevelChangePermissionModel.objects.create( + name="C", can_change=False, can_view=True + ) + r4 = RowLevelChangePermissionModel.objects.create( + name="D", can_change=True, can_view=True + ) change_url_1 = reverse( "admin:admin_views_rowlevelchangepermissionmodel_change", args=(r1.pk,) ) @@ -2943,8 +2951,8 @@ class AdminViewPermissionsTest(TestCase): change_url_3 = reverse( "admin:admin_views_rowlevelchangepermissionmodel_change", args=(r3.pk,) ) - change_url_6 = reverse( - "admin:admin_views_rowlevelchangepermissionmodel_change", args=(r6.pk,) + change_url_4 = reverse( + "admin:admin_views_rowlevelchangepermissionmodel_change", args=(r4.pk,) ) logins = [ self.superuser, @@ -2960,14 +2968,16 @@ class AdminViewPermissionsTest(TestCase): self.assertEqual(response.status_code, 403) response = self.client.post(change_url_1, {"name": "changed"}) self.assertEqual( - RowLevelChangePermissionModel.objects.get(id=1).name, "odd id" + RowLevelChangePermissionModel.objects.get(pk=r1.pk).name, + r1.name, ) self.assertEqual(response.status_code, 403) response = self.client.get(change_url_2) self.assertEqual(response.status_code, 200) response = self.client.post(change_url_2, {"name": "changed"}) self.assertEqual( - RowLevelChangePermissionModel.objects.get(id=2).name, "changed" + RowLevelChangePermissionModel.objects.get(pk=r2.pk).name, + "changed", ) self.assertRedirects(response, self.index_url) response = self.client.get(change_url_3) @@ -2975,14 +2985,15 @@ class AdminViewPermissionsTest(TestCase): response = self.client.post(change_url_3, {"name": "changed"}) self.assertEqual(response.status_code, 403) self.assertEqual( - RowLevelChangePermissionModel.objects.get(id=3).name, - "odd id mult 3", + RowLevelChangePermissionModel.objects.get(pk=r3.pk).name, + r3.name, ) - response = self.client.get(change_url_6) + response = self.client.get(change_url_4) self.assertEqual(response.status_code, 200) - response = self.client.post(change_url_6, {"name": "changed"}) + response = self.client.post(change_url_4, {"name": "changed"}) self.assertEqual( - RowLevelChangePermissionModel.objects.get(id=6).name, "changed" + RowLevelChangePermissionModel.objects.get(pk=r4.pk).name, + "changed", ) self.assertRedirects(response, self.index_url) @@ -2997,7 +3008,8 @@ class AdminViewPermissionsTest(TestCase): change_url_1, {"name": "changed"}, follow=True ) self.assertEqual( - RowLevelChangePermissionModel.objects.get(id=1).name, "odd id" + RowLevelChangePermissionModel.objects.get(pk=r1.pk).name, + r1.name, ) self.assertContains(response, "login-form") response = self.client.get(change_url_2, follow=True) @@ -3006,7 +3018,8 @@ class AdminViewPermissionsTest(TestCase): change_url_2, {"name": "changed again"}, follow=True ) self.assertEqual( - RowLevelChangePermissionModel.objects.get(id=2).name, "changed" + RowLevelChangePermissionModel.objects.get(pk=r2.pk).name, + "changed", ) self.assertContains(response, "login-form") self.client.post(reverse("admin:logout")) @@ -3306,8 +3319,8 @@ class AdminViewPermissionsTest(TestCase): # Test redirection when using row-level change permissions. Refs # #11513. - rl1 = RowLevelChangePermissionModel.objects.create(id=1, name="odd id") - rl2 = RowLevelChangePermissionModel.objects.create(id=2, name="even id") + rl1 = RowLevelChangePermissionModel.objects.create(name="A", can_change=False) + rl2 = RowLevelChangePermissionModel.objects.create(name="B", can_change=True) logins = [ self.superuser, self.viewuser, |
