visibility and db changes

elan-ev · Feb 3, 2025 · 03d88df · 03d88df
1 parent f3d2043
commit 03d88df
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 4 deletions.
diff --git a/lib/Models/Videos.php b/lib/Models/Videos.php
@@ -534,8 +534,9 @@ private function getSeminarVisibility($cid, $playlist_id)
 
             if (!empty($psv)) {
                 return [
-                    'visibility' => $psv->getValue('visibility'),
-                    'visible_timestamp' => $psv->getValue('visible_timestamp')
+                    'visibility'        => $psv->getValue('visibility'),
+                    'visible_timestamp' => $psv->getValue('visible_timestamp'),
+                    'available'         => $psv->getValue('available')
                 ];
             }
         }

diff --git a/lib/Routes/Playlist/PlaylistAddVideos.php b/lib/Routes/Playlist/PlaylistAddVideos.php
@@ -46,6 +46,9 @@ public function __invoke(Request $request, Response $response, $args)
             }
 
             $playlist->videos->store();
+
+            Videos::checkEventACL(null, null, $video);
+
             return $response->withStatus(204);
         }
 

diff --git a/lib/Routes/Playlist/PlaylistRemoveVideos.php b/lib/Routes/Playlist/PlaylistRemoveVideos.php
@@ -42,6 +42,8 @@ public function __invoke(Request $request, Response $response, $args)
                 $plvideo->delete();
             }
 
+            Videos::checkEventACL(null, null, $video);
+
             return $response->withStatus(204);
         }
 

diff --git a/migrations/099_add_playlist_availability.php b/migrations/099_add_playlist_availability.php
@@ -0,0 +1,27 @@
+<?php
+
+class AddPlaylistAvailability extends Migration
+{
+    public function description()
+    {
+        return 'Add availability status to videos added to course playlists and allow for different types of sync jobs';
+    }
+
+    public function up()
+    {
+        $db = DBManager::get();
+
+        $stmt = $db->exec('ALTER TABLE oc_playlist_video
+            ADD COLUMN `available` INT NOT NULL DEFAULT 0 AFTER video_id');
+
+        $stmt = $db->exec("ALTER TABLE oc_video_sync
+            ADD COLUMN `type` ENUM('video', 'coursevideo') NOT NULL DEFAULT 'video' AFTER `state`,
+            ADD COLUMN `data` TEXT NULL AFTER `type`
+        ");
+    }
+
+    public function down()
+    {
+
+    }
+}
diff --git a/vueapp/components/Videos/VideoRow.vue b/vueapp/components/Videos/VideoRow.vue
@@ -77,8 +77,8 @@
                         <img class="oc--image-button" :src="cut">
                     </span>
                 </a>
-                <span v-else-if="event.state == 'running'" class="oc--previewimage"
-                      :title="$gettext('Dieses Videos wird gerade von Opencast bearbeitet.')"
+                <span v-else-if="event.state == 'running' || event.seminar_visiblity.available == '0'" class="oc--previewimage"
+                      :title="$gettext('Dieses Video wird gerade von Opencast vearbeitet.')"
                 >
                     <studip-icon class="oc--image-button" shape="admin" role="status-yellow"></studip-icon>
                 </span>
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 $playlist->videos->store();
+                Videos::checkEventACL(null, null, $video);
                 return $response->withStatus(204);
             }
@@ Expand Down @@