MIR-1362 fix initialCondQuery hidden input field value

MyCoRe-Org · Dec 17, 2024 · e1ae52c · e1ae52c
1 parent 8c45bb1
commit e1ae52c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 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
@@ -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
@@ -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