From 2919f3a1339e53e8491808a95a9b681e1370b9df Mon Sep 17 00:00:00 2001 From: Skia Date: Mon, 12 Dec 2016 16:35:52 +0100 Subject: [PATCH] Allow former subscribers to see pictures --- core/models.py | 3 +++ sas/models.py | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/models.py b/core/models.py index b391cf24..3d6b3c3b 100644 --- a/core/models.py +++ b/core/models.py @@ -195,6 +195,9 @@ class User(AbstractBaseUser): def to_dict(self): return self.__dict__ + def was_subscribed(self): + return self.subscriptions.exists() + def is_subscribed(self): s = self.subscriptions.last() return s.is_valid_now() if s is not None else False diff --git a/sas/models.py b/sas/models.py index 0ab01e23..c5513a89 100644 --- a/sas/models.py +++ b/sas/models.py @@ -28,7 +28,7 @@ class Picture(SithFile): def can_be_viewed_by(self, user): return self.can_be_edited_by(user) or (self.is_in_sas and self.is_moderated and - user.is_in_group(settings.SITH_MAIN_MEMBERS_GROUP)) + user.was_subscribed()) def get_download_url(self): return reverse('sas:download', kwargs={'picture_id': self.id}) @@ -90,9 +90,8 @@ class Album(SithFile): return user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID) def can_be_viewed_by(self, user): - print(self.is_in_sas) return self.can_be_edited_by(user) or (self.is_in_sas and self.is_moderated and - user.is_in_group(settings.SITH_MAIN_MEMBERS_GROUP)) + user.was_subscribed()) def get_absolute_url(self): return reverse('sas:album', kwargs={'album_id': self.id})