diff --git a/tcms/kiwi_auth/admin.py b/tcms/kiwi_auth/admin.py index f28f4bb21d..edfe32cbb3 100644 --- a/tcms/kiwi_auth/admin.py +++ b/tcms/kiwi_auth/admin.py @@ -122,6 +122,7 @@ def get_readonly_fields(self, request, obj=None): "username", "last_login", "date_joined", + "email", ] # only other superusers can set the is_superuser flag diff --git a/tcms/kiwi_auth/tests/test_admin.py b/tcms/kiwi_auth/tests/test_admin.py index 347899b183..aa74778632 100644 --- a/tcms/kiwi_auth/tests/test_admin.py +++ b/tcms/kiwi_auth/tests/test_admin.py @@ -92,13 +92,12 @@ def test_superuser_can_change_other_users(self): response = self.client.get(f"/admin/auth/user/{self.tester.pk}/change/") response_str = str(response.content, encoding=settings.DEFAULT_CHARSET) - # 3 readonly fields - self.assertEqual(response_str.count("grp-readonly"), 3) + # 4 readonly fields + self.assertEqual(response_str.count("grp-readonly"), 4) # these fields can be edited self.assertContains(response, "id_first_name") self.assertContains(response, "id_last_name") - self.assertContains(response, "id_email") self.assertContains(response, "id_is_active") self.assertContains(response, "id_is_staff") self.assertContains(response, "id_is_superuser") @@ -111,7 +110,6 @@ def test_superuser_can_change_other_users(self): "first_name": "Changed by admin", # required fields below "username": self.tester.username, - "email": self.tester.email, "date_joined_0": "2018-09-03", "date_joined_1": "13:16:25", }, @@ -289,13 +287,12 @@ def test_moderator_can_change_other_users(self): response = self.client.get(f"/admin/auth/user/{self.tester.pk}/change/") response_str = str(response.content, encoding=settings.DEFAULT_CHARSET) - # 2 readonly fields - self.assertEqual(response_str.count("grp-readonly"), 2) + # 3 readonly fields + self.assertEqual(response_str.count("grp-readonly"), 3) # these fields can be edited self.assertContains(response, "id_first_name") self.assertContains(response, "id_last_name") - self.assertContains(response, "id_email") self.assertContains(response, "id_is_active") self.assertContains(response, "id_is_staff") self.assertContains(response, "id_groups") @@ -307,7 +304,6 @@ def test_moderator_can_change_other_users(self): "first_name": "Changed by moderator", # required fields below "username": self.tester.username, - "email": self.tester.email, "date_joined_0": "2018-09-03", "date_joined_1": "13:16:25", }, @@ -392,13 +388,12 @@ def test_regular_user_can_view_themselves(self): # only 1 hidden field for csrf self.assertContains(response, '