klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-22 14:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix SAS album display

Browse Source
This commit is contained in:
thomas girod 2024-08-09 18:06:58 +02:00
parent c56d6e3f6b
commit 9163e4dee6
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sas/models.py
View File

@ -175,6 +175,16 @@ class AlbumQuerySet(models.QuerySet):
""" """
if user.is_root or user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID): if user.is_root or user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID):
return self.all() return self.all()
if user.was_subscribed:
return self.filter(moderated=True)
# known bug : if all children of an album are also albums
# then this album is excluded, even if one of the sub-albums should be visible.
# The fs-like navigation is likely to be half-broken for non-subscribers,
# but that's ok, since non-subscribers are expected to see only the albums
# containing pictures on which they have been identified (hence, very few).
# Most, if not all, of their albums will be displayed on the
# `latest albums` section of the SAS.
# Moreover, they will still see all of their picture in their profile.
return self.filter( return self.filter(
Exists(Picture.objects.filter(parent_id=OuterRef("pk")).viewable_by(user)) Exists(Picture.objects.filter(parent_id=OuterRef("pk")).viewable_by(user))
) )