Merge pull request #819 from ae-utbm/fix-delete-picture

fix undeletable SAS pictures
This commit is contained in:
thomas girod
2024-09-10 23:12:59 +02:00
committed by GitHub
5 changed files with 82 additions and 61 deletions

View File

@ -333,10 +333,9 @@ class ModerationView(TemplateView):
kwargs["albums_to_moderate"] = Album.objects.filter(
is_moderated=False, is_in_sas=True, is_folder=True
).order_by("id")
kwargs["pictures"] = Picture.objects.filter(is_moderated=False)
kwargs["albums"] = Album.objects.filter(
id__in=kwargs["pictures"].values("parent").distinct("parent")
)
pictures = Picture.objects.filter(is_moderated=False).select_related("parent")
kwargs["pictures"] = pictures
kwargs["albums"] = [p.parent for p in pictures]
return kwargs