Merge branch 'slub:master' into update-typo12

slub · Feb 11, 2025 · 80b234e · 80b234e
2 parents e6fa430 + 498127d
commit 80b234e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/Classes/Controller/SingleCollectionController.php b/Classes/Controller/SingleCollectionController.php
@@ -120,6 +120,8 @@ public function showAction()
             $searchParams['order'] = 'asc';
         }
 
+        $searchParams['collection'] = $this->settings['collections'];
+
         // Get current page from request data because the parameter is shared between plugins
         $currentPage = $this->requestData['page'] ?? 1;
 

diff --git a/Resources/Private/Plugins/Kitodo/Templates/Search/Main.html b/Resources/Private/Plugins/Kitodo/Templates/Search/Main.html
@@ -74,16 +74,16 @@
         </f:if>
 
         <f:if condition="{extendedSlotCount}">
-            <div class="tx-dlf-search-extended">
-                <f:for each="{extendedSlotCount}" as="slot" iteration="slot_iterator">
+            <f:for each="{extendedSlotCount}" as="slot" iteration="slot_iterator">
+                <div class="tx-dlf-search-extended">
                     <f:form.select property="extOperator.{slot_iterator.index}" value="{lastSearch.extOperator}" class="tx-dlf-search-operator tx-dlf-search-operator-{slot_iterator.index}">
                         <f:for each="{operators}" as="operator">
                             <f:form.select.option value="{operator}" class="tx-dlf-search-operator-option tx-dlf-search-operator-{operator}">
                                 <f:translate key="search.operator.{operator}" />
                             </f:form.select.option>
                         </f:for>
                     </f:form.select>
-                    <f:form.select property="extField.{slot_iterator.index}" value="{lastSearch.extField}" class="tx-dlf-search-field-option tx-dlf-search-field-{slot_iterator.index}">
+                    <f:form.select property="extField.{slot_iterator.index}" value="{lastSearch.extField}" class="tx-dlf-search-field tx-dlf-search-field-{slot_iterator.index}">
                         <f:for each="{searchFields}" as="searchField">
                             <f:form.select.option value="{searchField}" class="tx-dlf-search-field-option tx-dlf-search-field-{searchField}">
                                 <f:translate key="LLL:EXT:dlf/Resources/Private/Language/locallang_metadata.xlf:metadata.{searchField}" />
@@ -94,8 +94,8 @@
                         property="extQuery.{slot_iterator.index}"
                         class="tx-dlf-search-query tx-dlf-search-query-{slot_iterator.index}"
                         value="{lastSearch.extQuery.{slot_iterator.index}}" />
-                </f:for>
-            </div>
+                </div>
+            </f:for>
         </f:if>
 
         <f:if condition="{settings.datesearch}">

diff --git a/Resources/Private/Plugins/Kitodo/Templates/Toolbox/Main.html b/Resources/Private/Plugins/Kitodo/Templates/Toolbox/Main.html
@@ -74,6 +74,18 @@
     </f:then>
 </f:if>
 
+<f:if condition="{renderModelDownloadTool} && {modelDownload}">
+    <f:then>
+        <li>
+            <span class="tx-dlf-tools-modeldownload">
+                <f:link.external uri="{modelDownload.url}">
+                    <f:translate key="downloadModel" />
+                </f:link.external>
+            </span>
+        </li>
+    </f:then>
+</f:if>
+
 <f:if condition="{settings.tools} == 'scoretool'">
     <f:then>
         <f:if condition="{score}">
@@ -207,7 +219,7 @@
                 <input type="submit" id="tx-dlf-search-in-document-button" value="{f:translate(key: 'search.submit')}" onclick="resetStart();" />
                 <input type="hidden" id="tx-dlf-search-in-document-start" name="{searchInDocument.labelStart}" value="0" />
                 <input type="hidden" id="tx-dlf-search-in-document-id" name="{searchInDocument.labelId}" value="{searchInDocument.documentId}" />
-                <input type="hidden" id="tx-dlf-search-in-document-pid" name="{searchInDocument.labelPid}" value="{searchInDocument.pageId}" />
+                <input type="hidden" id="tx-dlf-search-in-document-pid" name="{searchInDocument.labelPid}" value="{searchInDocument.documentPageId}" />
                 <input type="hidden" id="tx-dlf-search-in-document-page" name="{searchInDocument.labelPageUrl}" />
                 <input type="hidden" id="tx-dlf-search-in-document-highlight-word" name="{searchInDocument.labelHighlightWord}" />
                 <input type="hidden" id="tx-dlf-search-in-document-encrypted" name="{searchInDocument.labelEncrypted}" value="{searchInDocument.solrEncrypted}" />