From e6400fb641e426f957a36f9d91466ce8771335e9 Mon Sep 17 00:00:00 2001
From: sandeepsajan0 <sandeepsajan0@gmail.com>
Date: Fri, 6 Aug 2021 16:25:37 +0530
Subject: [PATCH] Change visibility to Team
---
hypha/apply/activity/messaging.py | 10 +---------
hypha/apply/activity/models.py | 2 +-
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/hypha/apply/activity/messaging.py b/hypha/apply/activity/messaging.py
index 8af8a37bf..7037e0ee5 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}
@@ -273,15 +274,6 @@ class ActivityAdapter(AdapterBase):
if is_transition(message_type) and not source.phase.permissions.can_view(source.user):
# User's shouldn't see status activity changes for stages that aren't visible to the them
return {'visibility': TEAM}
-
- # To fix visibility issue of review
- if message_type in [
- MESSAGES.NEW_REVIEW,
- MESSAGES.EDIT_REVIEW,
- MESSAGES.DELETE_REVIEW,
- ]:
- return {'visibility': REVIEWER}
-
return {}
def reviewers_updated(self, added=list(), removed=list(), **kwargs):
diff --git a/hypha/apply/activity/models.py b/hypha/apply/activity/models.py
index f6fd59861..cbd82e720 100644
--- a/hypha/apply/activity/models.py
+++ b/hypha/apply/activity/models.py
@@ -47,7 +47,7 @@ class BaseActivityQuerySet(models.QuerySet):
messages = ActivityAdapter.messages
if user.is_applicant:
return self.exclude(
- message__in=[messages.get(MESSAGES.NEW_REVIEW), messages.get(MESSAGES.REVIEW_OPINION)]
+ message=messages.get(MESSAGES.NEW_REVIEW)
).filter(visibility__in=self.model.visibility_for(user))
return self.filter(visibility__in=self.model.visibility_for(user))
--
GitLab