diff --git a/hypha/apply/activity/templatetags/activity_tags.py b/hypha/apply/activity/templatetags/activity_tags.py index 0e6cb23846bb90cdfc300a00c95e2c3d9f7b87e1..db7c6d4f28a0267203f699f2a55d0fc8c5d2bfe0 100644 --- a/hypha/apply/activity/templatetags/activity_tags.py +++ b/hypha/apply/activity/templatetags/activity_tags.py @@ -15,7 +15,7 @@ register = template.Library() def display_author(activity, user): if isinstance(activity.related_object, Review) and activity.source.user == user: return 'Reviewer' - return activity.user + return activity.user.get_full_name_with_group() @register.filter diff --git a/hypha/apply/funds/tests/test_models.py b/hypha/apply/funds/tests/test_models.py index 9d903d7ffca1cf11031685fc2b198728e5f7d728..4d91163377730d6035a2a7f30ccc4559da292f2b 100644 --- a/hypha/apply/funds/tests/test_models.py +++ b/hypha/apply/funds/tests/test_models.py @@ -247,7 +247,7 @@ class TestFormSubmission(TestCase): # Lead + applicant self.assertEqual(self.User.objects.count(), 2) new_user = self.User.objects.get(email=self.email) - self.assertEqual(new_user.get_full_name(), self.name) + self.assertEqual(new_user.full_name, self.name) self.assertEqual(ApplicationSubmission.objects.count(), 1) self.assertEqual(ApplicationSubmission.objects.first().user, new_user) diff --git a/hypha/apply/users/models.py b/hypha/apply/users/models.py index a00f87cdc469593d139f1f438b55fcc85f1e342e..97b8afb9dc004677394c16771746c60c2c1ed62c 100644 --- a/hypha/apply/users/models.py +++ b/hypha/apply/users/models.py @@ -115,6 +115,12 @@ class User(AbstractUser): def get_short_name(self): return self.email + def get_full_name_with_group(self): + is_apply_staff = f' ({STAFF_GROUP_NAME})' if self.is_apply_staff else '' + is_reviewer = f' ({REVIEWER_GROUP_NAME})' if self.is_reviewer else '' + is_applicant = f' ({APPLICANT_GROUP_NAME})' if self.is_applicant else '' + return f'{self.full_name.strip()}{is_apply_staff}{is_reviewer}{is_applicant}' + @cached_property def roles(self): return list(self.groups.values_list('name', flat=True))