From 3c74badaec6a4098099f29bf18dbbd56a82274ab Mon Sep 17 00:00:00 2001 From: Markos Gogoulos Date: Sat, 25 Oct 2025 15:37:16 +0300 Subject: [PATCH] a --- files/views/media.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/files/views/media.py b/files/views/media.py index 32ebb2c4..a0a1a201 100644 --- a/files/views/media.py +++ b/files/views/media.py @@ -174,15 +174,15 @@ class MediaList(APIView): media = Media.objects.none() else: base_queryset = Media.objects.prefetch_related("user", "tags") - user_media_filters = {'permissions__user': request.user} - media = base_queryset.filter(**user_media_filters) + + # Build OR conditions similar to _get_media_queryset + conditions = Q(permissions__user=request.user) if getattr(settings, 'USE_RBAC', False): rbac_categories = request.user.get_rbac_categories_as_member() - rbac_filters = {'category__in': rbac_categories} + conditions |= Q(category__in=rbac_categories) - rbac_media = base_queryset.filter(**rbac_filters) - media = media.union(rbac_media) + media = base_queryset.filter(conditions).distinct() elif author_param: user_queryset = User.objects.all() user = get_object_or_404(user_queryset, username=author_param)