From b872e59a2c7e6eca1170597e6641d66f4acf167d Mon Sep 17 00:00:00 2001
From: Banana <mail@bananas-playground.net>
Date: Sat, 25 Nov 2023 11:20:20 +0100
Subject: [PATCH] fixed #25  Sort direction select does not show the correct
 selected option

---
 CHANGELOG                                                  | 7 ++++---
 TODO                                                       | 1 +
 webclient/view/98/collections/collections.html             | 4 ++--
 webclient/view/98/managecolletions/managecolletions.html   | 4 ++--
 .../view/default/managecolletions/managecolletions.html    | 4 ++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 37861f1..64b9a16 100644
--- 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 2f847c1..c75ceea 100644
--- 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 8ae00dc..f814ade 100644
--- 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 00e1b10..e860bd3 100644
--- 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 7532ff3..c5abce7 100644
--- 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>
-- 
2.39.5