diff --git a/intranet/apps/announcements/models.py b/intranet/apps/announcements/models.py index 3a4cd45f15..b77690e229 100644 --- a/intranet/apps/announcements/models.py +++ b/intranet/apps/announcements/models.py @@ -11,7 +11,7 @@ from ...utils.date import get_date_range_this_year, is_current_year from ...utils.deletion import set_historical_user from ...utils.html import nullify_links -from ..eighth.models import EighthActivity +from ..eighth.models import EighthActivity, EighthSponsor class AnnouncementManager(Manager): @@ -158,7 +158,12 @@ def can_modify(self, user): return ( user.is_announcements_admin or self.is_club_announcement - and (user in self.activity.officers.all() or user in self.activity.sponsors.all() or user in self.activity.club_sponsors.all()) + and ( + user in self.activity.officers.all() + or user in self.activity.club_sponsors.all() + or EighthSponsor.objects.filter(user=user).exists() + and user.sponsor_obj in self.activity.sponsors.all() + ) ) # False, not None. This can be None if no AnnouncementRequest exists for this Announcement, diff --git a/intranet/apps/dashboard/views.py b/intranet/apps/dashboard/views.py index e8550d9938..0e6a15514d 100644 --- a/intranet/apps/dashboard/views.py +++ b/intranet/apps/dashboard/views.py @@ -616,7 +616,7 @@ def dashboard_view(request, show_widgets=True, show_expired=False, show_hidden_c dashboard_title = dashboard_header = "Club Announcements" view_announcements_url = "club_announcements" else: - dashboard_title = dashboard_header = "Announcements" + dashboard_title = dashboard_header = "Dashboard" num_senior_destinations = len(Senior.objects.filled())