From 8330e1eaf2b20f2a4342b747c4b56bf894a9d7d3 Mon Sep 17 00:00:00 2001 From: Bartuccio Antoine Date: Sun, 15 Sep 2019 16:43:17 +0200 Subject: [PATCH] sas: simplify and optimize permissions for SAS images --- sas/models.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/sas/models.py b/sas/models.py index a92d41c6..12651e91 100644 --- a/sas/models.py +++ b/sas/models.py @@ -71,16 +71,11 @@ class Picture(SithFile): return False def can_be_edited_by(self, user): - # file = SithFile.objects.filter(id=self.id).first() - return user.is_in_group( - settings.SITH_GROUP_SAS_ADMIN_ID - ) # or user.can_edit(file) + return user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID) def can_be_viewed_by(self, user): - # file = SithFile.objects.filter(id=self.id).first() - return self.can_be_edited_by(user) or ( - self.is_in_sas and self.is_moderated and user.was_subscribed - ) # or user.can_view(file) + # SAS pictures are visible to old subscribers + return self.is_in_sas and self.is_moderated and user.was_subscribed def get_download_url(self): return reverse("sas:download", kwargs={"picture_id": self.id})