diff --git a/hypha/apply/activity/messaging.py b/hypha/apply/activity/messaging.py index 0593f09feff319e9e50962142d13c34722a7943b..69559237e050c48a913d3f2d53b237e5237a4630 100644 --- a/hypha/apply/activity/messaging.py +++ b/hypha/apply/activity/messaging.py @@ -266,6 +266,7 @@ class ActivityAdapter(AdapterBase): MESSAGES.APPROVE_PROJECT, MESSAGES.REQUEST_PROJECT_CHANGE, MESSAGES.SEND_FOR_APPROVAL, + MESSAGES.NEW_REVIEW, ]: return {'visibility': TEAM} diff --git a/hypha/apply/activity/models.py b/hypha/apply/activity/models.py index 5b45873321a260bdf876fb8a0d04ea14c9846bb8..cbd82e72060d406a929c30b2dd18630d3d6a2989 100644 --- a/hypha/apply/activity/models.py +++ b/hypha/apply/activity/models.py @@ -41,6 +41,15 @@ VISIBILITY = { class BaseActivityQuerySet(models.QuerySet): def visible_to(self, user): + # To hide reviews from the applicant's activity feed + # Todo: It is just for historic data and not be needed for new data after this. + from .messaging import ActivityAdapter + messages = ActivityAdapter.messages + if user.is_applicant: + return self.exclude( + message=messages.get(MESSAGES.NEW_REVIEW) + ).filter(visibility__in=self.model.visibility_for(user)) + return self.filter(visibility__in=self.model.visibility_for(user)) def newer(self, activity):