fixed #25 Sort direction select does not show the correct selected option

diff --git a/CHANGELOG b/CHANGELOG
index 37861f1c296fc36e80cfe532c41ef46cb12a7d1b..64b9a169fc3dbb473a0bdf7ce4ffed006db11338 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,9 +2,10 @@
     * Config change. Added new entry. See upgrade/from-version-1.5.txt. It won't work if it is missing.
     * Licence change to GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
     * Cleanups
-    * Fixed: #21
-    * Fixed: #22
-    * Fixed: #26
+    * Fixed: #21 Debug? string in error log
+    * Fixed: #22 98 theme. Attachment selection checkbox are not all selectable
+    * Fixed: #26 98 theme. max column with
+    * Fixed: #25 98 design. Sort direction select does not show the correct selected option
 
 1.5 - Sacred Passage 2023-05-01
     * Added google books parser. See upgrade file for more infos.

diff --git a/TODO b/TODO
index 2f847c1b9186aad3d38a82bf1f5cc4b54572177d..c75ceea2c03e098ff9b57047bb75677446292488 100644 (file)
--- a/TODO
+++ b/TODO
@@ -15,6 +15,7 @@
 * Better error handling and display while adding / update and delete
 * Export of an entry, collection or everything. Stored on disk.
 * Import of the export
+* remove ifset and maybe ifsetvalue from summoner
 
 
 * Field management: Web interface to configure or even create new ones.

diff --git a/webclient/view/98/collections/collections.html b/webclient/view/98/collections/collections.html
index 8ae00dc2a51311fd45f898e1763635f7d1ce0acd..f814aded9ec8cb99f42f76e307cdd2752accdf9e 100644 (file)
--- a/webclient/view/98/collections/collections.html
+++ b/webclient/view/98/collections/collections.html
@@ -26,8 +26,8 @@
                        ?>
                </select>
                <select name="sd">
-                       <option value="ASC">ascending</option>
-                       <option value="DESC">descending</option>
+                       <option value="ASC" <?php echo ($TemplateData['pagination']['currentGetParameters']['sd'] ?? '') == 'ASC' ? 'selected' : '' ?>>ascending</option>
+                       <option value="DESC" <?php echo ($TemplateData['pagination']['currentGetParameters']['sd'] ?? '') == 'DESC' ? 'selected' : '' ?>>descending</option>
                </select>
                <input type="submit" value="Sort" />
        </form>

diff --git a/webclient/view/98/managecolletions/managecolletions.html b/webclient/view/98/managecolletions/managecolletions.html
index 00e1b10e5a12d5959944f61632003200a70c18cf..e860bd36141a9a820c41d280cdada38daa89c9c0 100644 (file)
--- a/webclient/view/98/managecolletions/managecolletions.html
+++ b/webclient/view/98/managecolletions/managecolletions.html
@@ -47,8 +47,8 @@
        <div class="field-row-stacked">
                <label for="defaultSortOrder">Default sort order</label>
                <select id="defaultSortOrder" name="fdata[defaultSortOrder]">
-                       <option value="ASC" <?php if(Summoner::ifsetValue($TemplateData['editData'], 'defaultSortOrder', 'ASC')) echo 'selected'; ?>>ASCENDING</option>
-                       <option value="DESC" <?php if(Summoner::ifsetValue($TemplateData['editData'], 'defaultSortOrder', 'DESC')) echo 'selected'; ?>>DESCENDING</option>
+                       <option value="ASC" <?php echo ($TemplateData['editData']['defaultSortOrder'] ?? '') == 'ASC' ? 'selected' : '' ?>>ASCENDING</option>
+                       <option value="DESC" <?php echo ($TemplateData['editData']['defaultSortOrder'] ?? '') == 'DESC' ? 'selected' : '' ?>>DESCENDING</option>
                </select>
        </div>
        <div class="field-row-stacked">

diff --git a/webclient/view/default/managecolletions/managecolletions.html b/webclient/view/default/managecolletions/managecolletions.html
index 7532ff3317d8aac7b0dee8ab619448e807c898b3..c5abce740e1b9ce0adbf60d0ef578a70b5a61652 100644 (file)
--- a/webclient/view/default/managecolletions/managecolletions.html
+++ b/webclient/view/default/managecolletions/managecolletions.html
@@ -56,8 +56,8 @@
                                <label class="uk-form-label" for="defaultSortField">Default sort order</label>
                                <div class="uk-form-controls">
                                        <select class="uk-select" id="defaultSortOrder" name="fdata[defaultSortOrder]">
-                                               <option value="ASC" <?php if(Summoner::ifsetValue($TemplateData['editData'], 'defaultSortOrder', 'ASC')) echo 'selected'; ?>>ASCENDING</option>
-                                               <option value="DESC" <?php if(Summoner::ifsetValue($TemplateData['editData'], 'defaultSortOrder', 'DESC')) echo 'selected'; ?>>DESCENDING</option>
+                                               <option value="ASC" <?php echo ($TemplateData['editData']['defaultSortOrder'] ?? '') == 'ASC' ? 'selected' : '' ?>>ASCENDING</option>
+                                               <option value="DESC" <?php echo ($TemplateData['editData']['defaultSortOrder'] ?? '') == 'DESC' ? 'selected' : '' ?>>DESCENDING</option>
                                        </select>
                                </div>
                        </div>