From e1ae52c8d984b584302732878f8d15cfe2963222 Mon Sep 17 00:00:00 2001
From: Oleksiy 'Alex' Levshyn <oleksiy.levshyn@uni-jena.de>
Date: Tue, 17 Dec 2024 09:32:28 +0100
Subject: [PATCH] MIR-1362 fix initialCondQuery hidden input field value

---
 .../xsl/mir-flatmir-layout-utils.xsl          | 20 +++++++++++--------
 .../META-INF/resources/js/mir/base.js         |  2 --
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/mir-layout/src/main/resources/xsl/mir-flatmir-layout-utils.xsl b/mir-layout/src/main/resources/xsl/mir-flatmir-layout-utils.xsl
index 0849ea01e1..8f4ba8230a 100644
--- a/mir-layout/src/main/resources/xsl/mir-flatmir-layout-utils.xsl
+++ b/mir-layout/src/main/resources/xsl/mir-flatmir-layout-utils.xsl
@@ -78,15 +78,18 @@
                 aria-label="Search" />
 
               <input type="hidden" id="initialCondQueryMirFlatmirLayout" name="initialCondQuery">
-                <xsl:choose>
-                  <xsl:when test="$initialCondQuery">
-                    <xsl:value-of select="$initialCondQuery"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:value-of select="'*'"/>
-                  </xsl:otherwise>
-                </xsl:choose>
+                <xsl:attribute name="value">
+                  <xsl:choose>
+                    <xsl:when test="$initialCondQuery">
+                      <xsl:value-of select="$initialCondQuery"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                      <xsl:value-of select="'*'"/>
+                    </xsl:otherwise>
+                  </xsl:choose>
+                </xsl:attribute>
               </input>
+
               <xsl:choose>
                 <xsl:when test="contains($isSearchAllowedForCurrentUser, 'true')">
                   <input name="owner" type="hidden" value="createdby:*" />
@@ -95,6 +98,7 @@
                   <input name="owner" type="hidden" value="createdby:{$CurrentUser}" />
                 </xsl:when>
               </xsl:choose>
+
               <button type="submit" class="btn btn-primary my-2 my-sm-0">
                 <i class="fas fa-search"></i>
               </button>
diff --git a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js
index 54b8be29b0..68bb18336b 100644
--- a/mir-module/src/main/resources/META-INF/resources/js/mir/base.js
+++ b/mir-module/src/main/resources/META-INF/resources/js/mir/base.js
@@ -305,8 +305,6 @@
     const selectMods = "#select_mods";
     // ID of the hidden element with the fq parameter
     const fqElement = "#fq";
-      // ID of the hidden element with the initial condQuery parameter in the mir-cosmol-layout-utils.xsl search form
-      const initialCondQueryMirCosmolLayout = "#initialCondQueryMirCosmolLayout";
     // ID of the hidden element with the initial condQuery parameter in the mir-flatmir-layout-utils.xsl search form
     const initialCondQueryMirFlatmirLayout = "#initialCondQueryMirFlatmirLayout";
     // ID of the hidden element with the initial condQuery parameter in the second search form