4.0.5 issues part2 (#2172)

* Folders : Improve styling on the tree and search. xibosignage/xibo#3183 * Display Profile : Fix not found error when filtering the grid where there are no results returned. * Library : video thumbnail column should be empty if no thumbnail is available. xibosignage/xibo#3191 * Applications : Fix scope checkboxes on edit form. xibosignage/xibo#3186
xibosignage · Oct 19, 2023 · cf9b33c · cf9b33c
1 parent bbadc29
commit cf9b33c
Show file tree

Hide file tree

Showing 18 changed files with 132 additions and 107 deletions.
diff --git a/lib/Controller/DisplayProfile.php b/lib/Controller/DisplayProfile.php
@@ -158,11 +158,14 @@ function grid(Request $request, Response $response)
             'logicalOperatorName' => $parsedQueryParams->getString('logicalOperatorName'),
         ];
 
-        $embed = ($parsedQueryParams->getString('embed') != null) ? explode(',', $parsedQueryParams->getString('embed')) : [];
-        $profiles = $this->displayProfileFactory->query($this->gridRenderSort($parsedQueryParams), $this->gridRenderFilter($filter, $parsedQueryParams));
+        $embed = ($parsedQueryParams->getString('embed') != null)
+            ? explode(',', $parsedQueryParams->getString('embed'))
+            : [];
 
-        if (count($profiles) <= 0)
-            throw new NotFoundException(__('Display Profile not found'), 'DisplayProfile');
+        $profiles = $this->displayProfileFactory->query(
+            $this->gridRenderSort($parsedQueryParams),
+            $this->gridRenderFilter($filter, $parsedQueryParams)
+        );
 
         foreach ($profiles as $profile) {
             // Load the config
@@ -189,20 +192,32 @@ function grid(Request $request, Response $response)
                 // Default Layout
                 $profile->buttons[] = array(
                     'id' => 'displayprofile_button_edit',
-                    'url' => $this->urlFor($request,'displayProfile.edit.form', ['id' => $profile->displayProfileId]),
+                    'url' => $this->urlFor(
+                        $request,
+                        'displayProfile.edit.form',
+                        ['id' => $profile->displayProfileId]
+                    ),
                     'text' => __('Edit')
                 );
 
                 $profile->buttons[] = array(
                     'id' => 'displayprofile_button_copy',
-                    'url' => $this->urlFor($request,'displayProfile.copy.form', ['id' => $profile->displayProfileId]),
+                    'url' => $this->urlFor(
+                        $request,
+                        'displayProfile.copy.form',
+                        ['id' => $profile->displayProfileId]
+                    ),
                     'text' => __('Copy')
                 );
 
                 if ($this->getUser()->checkDeleteable($profile)) {
                     $profile->buttons[] = array(
                         'id' => 'displayprofile_button_delete',
-                        'url' => $this->urlFor($request,'displayProfile.delete.form', ['id' => $profile->displayProfileId]),
+                        'url' => $this->urlFor(
+                            $request,
+                            'displayProfile.delete.form',
+                            ['id' => $profile->displayProfileId]
+                        ),
                         'text' => __('Delete')
                     );
                 }

diff --git a/lib/Controller/Library.php b/lib/Controller/Library.php
@@ -551,14 +551,23 @@ public function grid(Request $request, Response $response)
             try {
                 $module = $this->moduleFactory->getByType($media->mediaType);
                 if ($module->hasThumbnail) {
-                    $media->setUnmatchedProperty(
-                        'thumbnail',
-                        $this->urlFor($request, 'library.download', [
-                            'id' => $media->mediaId
-                        ], [
-                            'preview' => 1
-                        ])
-                    );
+                    $renderThumbnail = true;
+                    // for video, check if the cover image exists here.
+                    if ($media->mediaType === 'video') {
+                        $libraryLocation = $this->getConfig()->getSetting('LIBRARY_LOCATION');
+                        $renderThumbnail = file_exists($libraryLocation . $media->mediaId . '_videocover.png');
+                    }
+
+                    if ($renderThumbnail) {
+                        $media->setUnmatchedProperty(
+                            'thumbnail',
+                            $this->urlFor($request, 'library.download', [
+                                'id' => $media->mediaId
+                            ], [
+                                'preview' => 1
+                            ])
+                        );
+                    }
                 }
             } catch (NotFoundException $notFoundException) {
                 $this->getLog()->error('Module ' . $media->mediaType . ' not found');

diff --git a/lib/Factory/DisplayProfileFactory.php b/lib/Factory/DisplayProfileFactory.php
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2023 Xibo Signage Ltd
  *
- * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Xibo - Digital Signage - https://xibosignage.com
  *
  * This file is part of Xibo.
  *
@@ -363,93 +363,89 @@ public function query($sortOrder = null, $filterBy = [])
             $sortOrder = ['name'];
         }
 
-        try {
-            $params = array();
-            $select = 'SELECT displayProfileId, name, type, config, isDefault, userId, isCustom ';
 
-            $body = ' FROM `displayprofile` WHERE 1 = 1 ';
+        $params = [];
+        $select = 'SELECT displayProfileId, name, type, config, isDefault, userId, isCustom ';
 
-            if ($parsedFilter->getInt('displayProfileId') !== null) {
-                $body .= ' AND displayProfileId = :displayProfileId ';
-                $params['displayProfileId'] = $parsedFilter->getInt('displayProfileId');
-            }
+        $body = ' FROM `displayprofile` WHERE 1 = 1 ';
 
-            if ($parsedFilter->getInt('isDefault') !== null) {
-                $body .= ' AND isDefault = :isDefault ';
-                $params['isDefault'] = $parsedFilter->getInt('isDefault');
-            }
+        if ($parsedFilter->getInt('displayProfileId') !== null) {
+            $body .= ' AND displayProfileId = :displayProfileId ';
+            $params['displayProfileId'] = $parsedFilter->getInt('displayProfileId');
+        }
 
-            // Filter by DisplayProfile Name?
-            if ($parsedFilter->getString('displayProfile') != null) {
-                $terms = explode(',', $parsedFilter->getString('displayProfile'));
-                $logicalOperator = $parsedFilter->getString('logicalOperatorName', ['default' => 'OR']);
-                $this->nameFilter(
-                    'displayprofile',
-                    'name',
-                    $terms,
-                    $body,
-                    $params,
-                    ($parsedFilter->getCheckbox('useRegexForName') == 1),
-                    $logicalOperator
-                );
-            }
+        if ($parsedFilter->getInt('isDefault') !== null) {
+            $body .= ' AND isDefault = :isDefault ';
+            $params['isDefault'] = $parsedFilter->getInt('isDefault');
+        }
 
-            if ($parsedFilter->getString('type') != null) {
-                $body .= ' AND type = :type ';
-                $params['type'] = $parsedFilter->getString('type');
-            }
+        // Filter by DisplayProfile Name?
+        if ($parsedFilter->getString('displayProfile') != null) {
+            $terms = explode(',', $parsedFilter->getString('displayProfile'));
+            $logicalOperator = $parsedFilter->getString('logicalOperatorName', ['default' => 'OR']);
+            $this->nameFilter(
+                'displayprofile',
+                'name',
+                $terms,
+                $body,
+                $params,
+                ($parsedFilter->getCheckbox('useRegexForName') == 1),
+                $logicalOperator
+            );
+        }
+
+        if ($parsedFilter->getString('type') != null) {
+            $body .= ' AND type = :type ';
+            $params['type'] = $parsedFilter->getString('type');
+        }
 
-            if ($parsedFilter->getInt('commandId') !== null) {
-                $body .= '
+        if ($parsedFilter->getInt('commandId') !== null) {
+            $body .= '
                     AND `displayprofile`.displayProfileId IN (
                         SELECT `lkcommanddisplayprofile`.displayProfileId
                           FROM `lkcommanddisplayprofile`
                          WHERE `lkcommanddisplayprofile`.commandId = :commandId
                     )
                 ';
 
-                $params['commandId'] = $parsedFilter->getInt('commandId');
-            }
-
-            if ($parsedFilter->getInt('userId') !== null) {
-                $body .= ' AND `displayprofile`.userId = :userId ';
-                $params['userId'] = $parsedFilter->getInt('userId');
-            }
-
-            // Sorting?
-            $order = '';
-            if (is_array($sortOrder)) {
-                $order .= 'ORDER BY ' . implode(',', $sortOrder);
-            }
+            $params['commandId'] = $parsedFilter->getInt('commandId');
+        }
 
-            $limit = '';
-            // Paging
-            if ($filterBy !== null && $parsedFilter->getInt('start') !== null && $parsedFilter->getInt('length') !== null) {
-                $limit = ' LIMIT ' . $parsedFilter->getInt('start', ['default' => 0]) . ', ' . $parsedFilter->getInt('length', ['default' => 10]);
-            }
+        if ($parsedFilter->getInt('userId') !== null) {
+            $body .= ' AND `displayprofile`.userId = :userId ';
+            $params['userId'] = $parsedFilter->getInt('userId');
+        }
 
-            $sql = $select . $body . $order . $limit;
+        // Sorting?
+        $order = '';
+        if (is_array($sortOrder)) {
+            $order .= 'ORDER BY ' . implode(',', $sortOrder);
+        }
 
-            foreach ($this->getStore()->select($sql, $params) as $row) {
-                $profile = $this->createEmpty()->hydrate($row, ['intProperties' => ['isDefault', 'isCustom']]);
+        $limit = '';
+        // Paging
+        if ($filterBy !== null && $parsedFilter->getInt('start') !== null && $parsedFilter->getInt('length') !== null) {
+            $limit = ' LIMIT ' . $parsedFilter->getInt('start', ['default' => 0]) .
+                ', ' . $parsedFilter->getInt('length', ['default' => 10]);
+        }
 
-                $profile->excludeProperty('configDefault');
-                $profile->excludeProperty('configTabs');
-                $profiles[] = $profile;
-            }
+        $sql = $select . $body . $order . $limit;
 
-            // Paging
-            if ($limit != '' && count($profiles) > 0) {
-                $results = $this->getStore()->select('SELECT COUNT(*) AS total ' . $body, $params);
-                $this->_countLast = intval($results[0]['total']);
-            }
+        foreach ($this->getStore()->select($sql, $params) as $row) {
+            $profile = $this->createEmpty()->hydrate($row, ['intProperties' => ['isDefault', 'isCustom']]);
 
-            return $profiles;
-        } catch (\Exception $e) {
-            $this->getLog()->error($e);
+            $profile->excludeProperty('configDefault');
+            $profile->excludeProperty('configTabs');
+            $profiles[] = $profile;
+        }
 
-            throw new NotFoundException();
+        // Paging
+        if ($limit != '' && count($profiles) > 0) {
+            $results = $this->getStore()->select('SELECT COUNT(*) AS total ' . $body, $params);
+            $this->_countLast = intval($results[0]['total']);
         }
+
+        return $profiles;
     }
 
     public function getAvailableTypes()

diff --git a/ui/src/core/xibo-cms.js b/ui/src/core/xibo-cms.js
@@ -3682,7 +3682,7 @@ function initJsTreeAjax(container, id, isForm, ttl, onReady = null, onSelected =
 
         $(container).jstree({
             "state" : state,
-            "plugins" : ["contextmenu", "state", "unique", "sort", "themes", "types", 'search'].concat(plugins),
+            "plugins" : ["contextmenu", "state", "unique", "sort", "types", 'search'].concat(plugins),
             "contextmenu":{
                 "items": function($node, checkContextMenuPermissions) {
                     // items in context menu need to check user permissions before we render them
@@ -3766,21 +3766,18 @@ function initJsTreeAjax(container, id, isForm, ttl, onReady = null, onSelected =
                         }
                     });
                 }},
-            "themes" : {
-                "responsive" : true
-            },
             "types" : {
                 "root" : {
-                    "icon" : "fa fa-file text-warning"
+                    "icon" : "fa fa-file text-xibo-primary"
                 },
                 "home" : {
-                    "icon" : "fa fa-home text-success"
+                    "icon" : "fa fa-home text-xibo-primary"
                 },
                 "default" : {
-                    "icon" : "fa fa-folder text-warning"
+                    "icon" : "fa fa-folder text-xibo-primary"
                 },
                 "open" : {
-                    "icon" : "fa fa-folder-open text-warning"
+                    "icon" : "fa fa-folder-open text-xibo-primary"
                 }
             },
             'search' : {
@@ -3799,7 +3796,11 @@ function initJsTreeAjax(container, id, isForm, ttl, onReady = null, onSelected =
                 },
                 'data' : {
                     "url": foldersUrl + (homeFolderId ? '?homeFolderId='+homeFolderId : '')
-                }
+                },
+                "themes" : {
+                    'responsive' : true,
+                    'dots' : false,
+                },
             }
         }).bind('ready.jstree', function(e, data) {
             // depending on the state of folder tree, hide/show as needed when we load the grid page

diff --git a/views/applications-form-edit.twig b/views/applications-form-edit.twig
@@ -1,8 +1,8 @@
 {#
 /**
- * Copyright (C) 2022 Xibo Signage Ltd
+ * Copyright (C) 2023 Xibo Signage Ltd
  *
- * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Xibo - Digital Signage - https://xibosignage.com
  *
  * This file is part of Xibo.
  *
@@ -128,7 +128,7 @@
                         {% for scope in scopes %}
                             {% set title %}{{ scope.description }}{% endset %}
                             {% set id %}scope_{{ scope.id }}{% endset %}
-                            {{ forms.checkbox(id, title, scope.selected) }}
+                            {{ forms.checkbox(id, title, scope.getUnmatchedProperty('selected')) }}
                         {% endfor %}
 
                         {% set title %}{% trans "Owner" %}{% endset %}

diff --git a/views/authed.twig b/views/authed.twig
@@ -526,7 +526,7 @@
                     </div>
                     <div class="modal-body">
                         <div class="form-group card p-3 mb-3 bg-light">
-                        <input id="jstree-search-form" type="text" placeholder="{% trans "Search" %}">
+                        <input id="jstree-search-form" class="form-control" type="text" placeholder="{% trans "Search" %}">
                         <div class="folder-search-no-results d-none">
                             <p>{% trans 'No Folders matching the search term' %}</p>
                         </div>

diff --git a/views/campaign-page.twig b/views/campaign-page.twig
@@ -87,7 +87,7 @@
 
                 <div class="row">
                     <div class="col-sm-2 p-3 bg-light" id="grid-folder-filter">
-                        <input id="jstree-search" type="text" placeholder="{% trans "Search" %}">
+                        <input id="jstree-search" class="form-control" type="text" placeholder="{% trans "Search" %}">
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input" id="folder-tree-clear-selection-button">
                             <label class="form-check-label" for="folder-tree-clear-selection-button" title="{% trans "Search in all folders" %}">{% trans "All Folders" %}</label>

diff --git a/views/dataset-page.twig b/views/dataset-page.twig
@@ -60,7 +60,7 @@
 
                 <div class="row">
                     <div class="col-sm-2 p-3 bg-light" id="grid-folder-filter">
-                        <input id="jstree-search" type="text" placeholder="{% trans "Search" %}">
+                        <input id="jstree-search" class="form-control" type="text" placeholder="{% trans "Search" %}">
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input" id="folder-tree-clear-selection-button">
                             <label class="form-check-label" for="folder-tree-clear-selection-button" title="{% trans "Search in all folders" %}">{% trans "All Folders" %}</label>

diff --git a/views/display-page.twig b/views/display-page.twig
@@ -179,7 +179,7 @@
                 </div>
                 <div class="row">
                     <div class="col-sm-2 p-3 bg-light" id="grid-folder-filter">
-                        <input id="jstree-search" type="text" placeholder="{% trans "Search" %}">
+                        <input id="jstree-search" class="form-control" type="text" placeholder="{% trans "Search" %}">
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input" id="folder-tree-clear-selection-button">
                             <label class="form-check-label" for="folder-tree-clear-selection-button" title="{% trans "Search in all folders" %}">{% trans "All Folders" %}</label>

diff --git a/views/displaygroup-page.twig b/views/displaygroup-page.twig
@@ -84,7 +84,7 @@
                 </div>
                 <div class="row">
                     <div class="col-sm-2 p-3 bg-light" id="grid-folder-filter">
-                        <input id="jstree-search" type="text" placeholder="{% trans "Search" %}">
+                        <input id="jstree-search" class="form-control" type="text" placeholder="{% trans "Search" %}">
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input" id="folder-tree-clear-selection-button">
                             <label class="form-check-label" for="folder-tree-clear-selection-button" title="{% trans "Search in all folders" %}">{% trans "All Folders" %}</label>

diff --git a/views/folders-page.twig b/views/folders-page.twig
@@ -31,7 +31,7 @@
         <div class="widget-body">
             <div class="row">
                 <div class="col-md-3">
-                    <input id="jstree-search" type="text" placeholder="{% trans "Search" %}">
+                    <input id="jstree-search" class="form-control" type="text" placeholder="{% trans "Search" %}">
                     <div class="folder-search-no-results d-none">
                         <p>{% trans 'No Folders matching the search term' %}</p>
                     </div>

diff --git a/views/layout-page.twig b/views/layout-page.twig
@@ -113,7 +113,7 @@
 
                 <div class="row">
                     <div class="col-sm-2 p-3 bg-light" id="grid-folder-filter">
-                        <input id="jstree-search" type="text" placeholder="{% trans "Search" %}">
+                        <input id="jstree-search" class="form-control" type="text" placeholder="{% trans "Search" %}">
                         <div class="form-check">
                             <input type="checkbox" class="form-check-input" id="folder-tree-clear-selection-button">
                             <label class="form-check-label" for="folder-tree-clear-selection-button" title="{% trans "Search in all folders" %}">{% trans "All Folders" %}</label>