From 70feecde3064a24f472c5323ea930a0fa04cc747 Mon Sep 17 00:00:00 2001 From: Sli Date: Fri, 3 Apr 2026 16:49:19 +0200 Subject: [PATCH] Fix bug where you can't select /SAS as a parent album --- sas/forms.py | 4 +++- sas/models.py | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sas/forms.py b/sas/forms.py index af3547c8..a478ce43 100644 --- a/sas/forms.py +++ b/sas/forms.py @@ -50,13 +50,15 @@ class AlbumEditForm(forms.ModelForm): model = Album fields = ["name", "date", "file", "parent", "edit_groups"] widgets = { - "parent": AutoCompleteSelectAlbum, "edit_groups": AutoCompleteSelectMultipleGroup, } name = forms.CharField(max_length=Album.NAME_MAX_LENGTH, label=_("file name")) date = forms.DateField(label=_("Date"), widget=SelectDate, required=True) recursive = forms.BooleanField(label=_("Apply rights recursively"), required=False) + parent = forms.ModelChoiceField( + Album.objects.all(), required=True, widget=AutoCompleteSelectAlbum + ) class PictureModerationRequestForm(forms.ModelForm): diff --git a/sas/models.py b/sas/models.py index 64f6c15b..5d8cee44 100644 --- a/sas/models.py +++ b/sas/models.py @@ -205,7 +205,13 @@ class AlbumQuerySet(models.QuerySet): class SASAlbumManager(models.Manager): def get_queryset(self): - return super().get_queryset().filter(is_in_sas=True, is_folder=True) + return ( + super() + .get_queryset() + .filter( + Q(id=settings.SITH_SAS_ROOT_DIR_ID) | Q(is_in_sas=True, is_folder=True) + ) + ) class Album(SasFile):