From 9a42d415afb00eaaf146661c50b006d5b1b69d81 Mon Sep 17 00:00:00 2001 From: Markos Gogoulos Date: Wed, 6 May 2026 11:28:18 +0300 Subject: [PATCH] wtv --- cms/version.py | 2 +- files/views/categories.py | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/cms/version.py b/cms/version.py index d69f8ef8..41b837dc 100644 --- a/cms/version.py +++ b/cms/version.py @@ -1 +1 @@ -VERSION = "8.0.1c" +VERSION = "8.0.1d" diff --git a/files/views/categories.py b/files/views/categories.py index 9c0993e5..01a4d8de 100644 --- a/files/views/categories.py +++ b/files/views/categories.py @@ -23,22 +23,20 @@ class CategoryList(APIView): }, ) def get(self, request, format=None): - base_filters = {} - - if not is_mediacms_editor(request.user): - base_filters = {"is_rbac_category": False} - - base_queryset = Category.objects.prefetch_related("user") - categories = base_queryset.filter(**base_filters) + show_lms = getattr(settings, 'SHOW_LMS_COURSES_IN_CATEGORIES', True) + categories = Category.objects.prefetch_related("user") + + if not show_lms: + categories = categories.filter(is_lms_course=False) if not is_mediacms_editor(request.user): + categories = categories.filter(is_rbac_category=False) if getattr(settings, 'USE_RBAC', False) and request.user.is_authenticated: rbac_categories = request.user.get_rbac_categories_as_member() + if not show_lms: + rbac_categories = rbac_categories.filter(is_lms_course=False) categories = categories.union(rbac_categories) - if not getattr(settings, 'SHOW_LMS_COURSES_IN_CATEGORIES', True): - categories = categories.filter(is_lms_course=False) - categories = categories.order_by("title") serializer = CategorySerializer(categories, many=True, context={"request": request})