mirror of
https://github.com/mediacms-io/mediacms.git
synced 2026-06-06 17:13:02 -04:00
fix: django connection settings (#1529)
This commit is contained in:
@@ -10,7 +10,7 @@ from django.conf import settings
|
||||
from django.contrib.postgres.indexes import GinIndex
|
||||
from django.contrib.postgres.search import SearchVectorField
|
||||
from django.core.files import File
|
||||
from django.db import models
|
||||
from django.db import models, transaction
|
||||
from django.db.models import Func, Value
|
||||
from django.db.models.signals import m2m_changed, post_delete, post_save, pre_delete
|
||||
from django.dispatch import receiver
|
||||
@@ -536,7 +536,9 @@ class Media(models.Model):
|
||||
|
||||
from .. import tasks
|
||||
|
||||
tasks.produce_sprite_from_video.delay(self.friendly_token)
|
||||
# Defer until the surrounding transaction commits so the worker can
|
||||
# actually find the Media row. Runs immediately if not in a tx.
|
||||
transaction.on_commit(lambda token=self.friendly_token: tasks.produce_sprite_from_video.delay(token))
|
||||
return True
|
||||
|
||||
def encode(self, profiles=[], force=True, chunkize=True):
|
||||
|
||||
@@ -660,7 +660,9 @@ class MediaBulkUserActions(APIView):
|
||||
|
||||
# Prioritize category_uids
|
||||
if category_uids:
|
||||
categories = Category.objects.filter(uid__in=category_uids)
|
||||
requested = Category.objects.filter(uid__in=category_uids)
|
||||
allowed_ids = [cat.id for cat in requested if not cat.is_rbac_category or request.user.has_contributor_access_to_category(cat)]
|
||||
categories = Category.objects.filter(id__in=allowed_ids)
|
||||
elif lti_context_id:
|
||||
# Filter categories by lti_context_id and ensure they ARE RBAC categories
|
||||
potential_categories = Category.objects.filter(lti_context_id=lti_context_id, is_rbac_category=True)
|
||||
@@ -691,9 +693,11 @@ class MediaBulkUserActions(APIView):
|
||||
if not category_uids:
|
||||
return Response({"detail": "category_uids is required for remove_from_category action"}, status=status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
categories = Category.objects.filter(uid__in=category_uids)
|
||||
requested = Category.objects.filter(uid__in=category_uids)
|
||||
allowed_ids = [cat.id for cat in requested if not cat.is_rbac_category or request.user.has_contributor_access_to_category(cat)]
|
||||
categories = Category.objects.filter(id__in=allowed_ids)
|
||||
if not categories:
|
||||
return Response({"detail": "No matching categories found"}, status=status.HTTP_400_BAD_REQUEST)
|
||||
return Response({"detail": "No matching categories found or access denied"}, status=status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
removed_count = 0
|
||||
for category in categories:
|
||||
|
||||
Reference in New Issue
Block a user