sharing

files/forms.py

@@ -138,8 +138,9 @@ class MediaPublishForm(forms.ModelForm):
 
         self.was_shared = self.instance.is_shared if self.instance.pk else False
         is_embed_mode = self._check_embed_mode()
-        if not is_embed_mode:
-            self.fields.pop('shared')
+
+        self.fields["shared"].initial = self.was_shared
+        self.initial["shared"] = self.was_shared
 
         if not is_mediacms_editor(user):
             for field in ["featured", "reported_times", "is_reviewed"]:
@@ -153,10 +154,6 @@ class MediaPublishForm(forms.ModelForm):
                     valid_states.append(self.instance.state)
                 self.fields["state"].choices = [(state, dict(MEDIA_STATES).get(state, state)) for state in valid_states]
 
-        if is_embed_mode:
-            self.fields["shared"].initial = self.was_shared
-            self.initial["shared"] = self.was_shared
-
         if getattr(settings, 'USE_RBAC', False) and 'category' in self.fields:
             if is_mediacms_editor(user):
                 pass

files/methods.py

@@ -238,6 +238,8 @@ def show_related_media(media, request=None, limit=100):
         return show_related_media_calculated(media, request, limit)
     elif settings.RELATED_MEDIA_STRATEGY == "author":
         return show_related_media_author(media, request, limit)
+    elif settings.RELATED_MEDIA_STRATEGY == "no_related":
+        return []
 
     return show_related_media_content(media, request, limit)
 

files/views/media.py

@@ -509,16 +509,9 @@ class MediaBulkUserActions(APIView):
 
                 m.save(update_fields=["state", "listable"])
 
-            shared = request.data.get('shared', None)
+            remove_sharing = request.data.get('remove_sharing', False)
 
-            if shared is True:
-                for m in media:
-                    MediaPermission.objects.get_or_create(
-                        media=m,
-                        user=request.user,
-                        defaults={'owner_user': request.user, 'permission': 'owner'},
-                    )
-            elif shared is False or (shared is None and state == 'private'):
+            if remove_sharing:
                 MediaPermission.objects.filter(media__in=media).delete()
                 for m in media:
                     rbac_cats = m.category.filter(is_rbac_category=True)