diff --git a/lib/Models/Videos.php b/lib/Models/Videos.php index 45913ef1..cde5cd74 100644 --- 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 index d4066f30..b745566a 100644 --- 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 index 5fd205bf..a6684eeb 100644 --- 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 new file mode 100644 index 00000000..22f393a4 --- /dev/null +++ b/migrations/099_add_playlist_availability.php @@ -0,0 +1,27 @@ +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() + { + + } +} \ No newline at end of file diff --git a/vueapp/components/Videos/VideoRow.vue b/vueapp/components/Videos/VideoRow.vue index a112372c..fd83d3fe 100644 --- a/vueapp/components/Videos/VideoRow.vue +++ b/vueapp/components/Videos/VideoRow.vue @@ -77,8 +77,8 @@ -