Playlists: Updated validation for library and widgets in dynamic play…

…lists
xibosignage · Aug 22, 2024 · da53951 · da53951
1 parent 485f74e
commit da53951
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/lib/Controller/Library.php b/lib/Controller/Library.php
@@ -1168,10 +1168,12 @@ public function add(Request $request, Response $response)
             $folderId = $this->getUser()->homeFolderId;
         }
 
-        $playlist = $this->playlistFactory->getById($parsedBody->getInt('playlistId'));
+        if ($parsedBody->getInt('playlistId') !== null) {
+            $playlist = $this->playlistFactory->getById($parsedBody->getInt('playlistId'));
 
-        if ($playlist->isDynamic === 1) {
-            throw new InvalidArgumentException(__('This Playlist is dynamically managed so cannot accept manual assignments.'), 'isDynamic');
+            if ($playlist->isDynamic === 1) {
+                throw new InvalidArgumentException(__('This Playlist is dynamically managed so cannot accept manual assignments.'), 'isDynamic');
+            }
         }
 
         $options = array_merge([

diff --git a/lib/Controller/Widget.php b/lib/Controller/Widget.php
@@ -1666,10 +1666,6 @@ public function widgetSetRegion(Request $request, Response $response, $id)
             throw new InvalidArgumentException(__('This Layout is not a Draft, please checkout.'), 'layoutId');
         }
 
-        if ($playlist->isDynamic === 1) {
-            throw new InvalidArgumentException(__('This Playlist is dynamically managed so cannot accept manual assignments.'), 'isDynamic');
-        }
-
         // Make sure we are on a Drawer Widget
         $region = $this->regionFactory->getById($playlist->regionId);
         if ($region->isDrawer !== 1) {
@@ -1752,10 +1748,6 @@ public function saveElements(Request $request, Response $response, $id)
             throw new InvalidArgumentException(__('This Layout is not a Draft, please checkout.'), 'layoutId');
         }
 
-        if ($playlist->isDynamic === 1) {
-            throw new InvalidArgumentException(__('This Playlist is dynamically managed so cannot accept manual assignments.'), 'isDynamic');
-        }
-
         // Store the target regionId
         $widget->load();