push

files/context_processors.py

@@ -4,7 +4,6 @@ from cms.version import VERSION
 
 from .frontend_translations import get_translation, get_translation_strings
 from .methods import is_mediacms_editor, is_mediacms_manager
-from .models import Category
 
 
 def stuff(request):
@@ -70,13 +69,5 @@ def stuff(request):
 
         if lti_session and request.user.is_authenticated:
             ret['lti_session'] = lti_session
-            platform_id = lti_session.get('platform_id')
-            context_id = lti_session.get('context_id')
 
-            if platform_id and context_id:
-                category = Category.objects.filter(lti_platform_id=platform_id, lti_context_id=context_id).first()
-                if category:
-                    has_access = request.user.has_contributor_access_to_category(category)
-                    if has_access:
-                        ret['lti_category_uid'] = category.uid
     return ret

files/helpers.py

@@ -965,3 +965,13 @@ def get_alphanumeric_only(string):
     """
     string = "".join([char for char in string if char.isalnum()])
     return string.lower()
+
+
+def get_alphanumeric_and_spaces(string):
+    """Returns a query that contains only alphanumeric characters and spaces
+    This include characters other than the English alphabet too
+    """
+    string = "".join([char for char in string if char.isalnum() or char.isspace()])
+    # Replace multiple spaces with single space and strip
+    string = " ".join(string.split())
+    return string.lower()

files/models/category.py

@@ -144,7 +144,7 @@ class Tag(models.Model):
         return True
 
     def save(self, *args, **kwargs):
-        self.title = helpers.get_alphanumeric_only(self.title)
+        self.title = helpers.get_alphanumeric_and_spaces(self.title)
         self.title = self.title[:100]
         super(Tag, self).save(*args, **kwargs)
 

files/urls.py

@@ -80,6 +80,7 @@ urlpatterns = [
         views.trim_video,
     ),
     re_path(r"^api/v1/categories$", views.CategoryList.as_view()),
+    re_path(r"^api/v1/categories/contributor$", views.CategoryListContributor.as_view()),
     re_path(r"^api/v1/tags$", views.TagList.as_view()),
     re_path(r"^api/v1/comments$", views.CommentList.as_view()),
     re_path(

files/views/__init__.py

@@ -1,7 +1,7 @@
 # Import all views for backward compatibility
 
 from .auth import custom_login_view, saml_metadata  # noqa: F401
-from .categories import CategoryList, TagList  # noqa: F401
+from .categories import CategoryList, CategoryListContributor, TagList  # noqa: F401
 from .comments import CommentDetail, CommentList  # noqa: F401
 from .encoding import EncodeProfileList, EncodingDetail  # noqa: F401
 from .media import MediaActions  # noqa: F401

files/views/categories.py

@@ -43,6 +43,40 @@ class CategoryList(APIView):
         return Response(ret)
 
 
+class CategoryListContributor(APIView):
+    """List categories where user has contributor access"""
+
+    @swagger_auto_schema(
+        manual_parameters=[],
+        tags=['Categories'],
+        operation_summary='Lists Categories for Contributors',
+        operation_description='Lists all categories where the user has contributor access',
+        responses={
+            200: openapi.Response('response description', CategorySerializer),
+        },
+    )
+    def get(self, request, format=None):
+        if not request.user.is_authenticated:
+            return Response([])
+
+        categories = Category.objects.none()
+
+        # Get global/public categories (non-RBAC)
+        public_categories = Category.objects.filter(is_rbac_category=False).prefetch_related("user")
+
+        # Get RBAC categories where user has contributor access
+        if getattr(settings, 'USE_RBAC', False):
+            rbac_categories = request.user.get_rbac_categories_as_contributor()
+            categories = public_categories.union(rbac_categories)
+        else:
+            categories = public_categories
+
+        categories = categories.order_by("title")
+
+        serializer = CategorySerializer(categories, many=True, context={"request": request})
+        return Response(serializer.data)
+
+
 class TagList(APIView):
     """List tags"""