Correctly show or hide EAD level selection in popup dialogs

effective-webwork · Nov 7, 2024 · 65d27ef · 65d27ef
1 parent 4ca6079
commit 65d27ef
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/...ain/webapp/WEB-INF/templates/includes/processFromTemplate/dialogs/eadLevelSelection.xhtml b/...ain/webapp/WEB-INF/templates/includes/processFromTemplate/dialogs/eadLevelSelection.xhtml
@@ -17,7 +17,7 @@
         xmlns:h="http://xmlns.jcp.org/jsf/html"
         xmlns:p="http://primefaces.org/ui">
 
-    <ui:fragment rendered="#{CreateProcessForm.currentImportConfiguration.metadataFormat eq 'EAD'}">
+    <ui:fragment>
         <p:panelGrid id="eadLevelSelection"
                      styleClass="ead-level-selection-table"
                      columns="2">

diff --git a/...o/src/main/webapp/WEB-INF/templates/includes/processFromTemplate/dialogs/fileUpload.xhtml b/...o/src/main/webapp/WEB-INF/templates/includes/processFromTemplate/dialogs/fileUpload.xhtml
@@ -72,7 +72,12 @@
                     </div>
                 </p:row>
             </p:panelGrid>
-            <ui:include src="/WEB-INF/templates/includes/processFromTemplate/dialogs/eadLevelSelection.xhtml"/>
+            <h:panelGroup id="eadLevelSelectionWrapper">
+                <ui:fragment rendered="#{CreateProcessForm.currentImportConfiguration.configurationType eq 'FILE_UPLOAD' and
+                                         CreateProcessForm.currentImportConfiguration.metadataFormat eq 'EAD'}">
+                    <ui:include src="/WEB-INF/templates/includes/processFromTemplate/dialogs/eadLevelSelection.xhtml"/>
+                </ui:fragment>
+            </h:panelGroup>
             <h:panelGroup layout="block"
                           id="fileUploadButton">
                 <p:commandButton id="close"

diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/processFromTemplate/dialogs/import.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/processFromTemplate/dialogs/import.xhtml
@@ -116,7 +116,10 @@
                 </p:row>
             </p:panelGrid>
             <h:panelGroup id="eadLevelSelectionWrapper">
-                <ui:include src="/WEB-INF/templates/includes/processFromTemplate/dialogs/eadLevelSelection.xhtml"/>
+                <ui:fragment rendered="#{CreateProcessForm.currentImportConfiguration.configurationType eq 'OPAC_SEARCH' and
+                                         CreateProcessForm.currentImportConfiguration.metadataFormat eq 'EAD'}">
+                    <ui:include src="/WEB-INF/templates/includes/processFromTemplate/dialogs/eadLevelSelection.xhtml"/>
+                </ui:fragment>
             </h:panelGroup>
             <h:panelGroup layout="block"
                           id="catalogSearchButton">

diff --git a/Kitodo/src/main/webapp/pages/processFromTemplate.xhtml b/Kitodo/src/main/webapp/pages/processFromTemplate.xhtml
@@ -52,7 +52,6 @@
             <p:menuitem id="opacSearch"
                         process="@this"
                         value="#{msgs['newProcess.catalogueSearch.heading']}"
-                        actionListener="#{CreateProcessForm.setCurrentImportConfiguration(null)}"
                         action="#{CreateProcessForm.checkRulesetConfiguration()}"
                         disabled="#{empty CreateProcessForm.catalogImportDialog.importConfigurations}"
                         icon="fa fa-book"
@@ -63,7 +62,6 @@
             <p:menuitem id="fileUpload"
                         process="@this"
                         value="#{msgs['newProcess.fileUpload.heading']}"
-                        actionListener="#{CreateProcessForm.setCurrentImportConfiguration(null)}"
                         oncomplete="PF('fileUploadDialog').show();"
                         disabled="#{empty CreateProcessForm.fileUploadDialog.importConfigurations}"
                         icon="fa fa-upload"
@@ -74,7 +72,6 @@
             <p:menuitem id="searchEdit"
                         process="@this"
                         value="#{msgs.processTemplate}"
-                        actionListener="#{CreateProcessForm.setCurrentImportConfiguration(null)}"
                         oncomplete="PF('searchEditDialog').show();"
                         disabled="#{empty CreateProcessForm.searchDialog.processesForChoiceList}"
                         icon="fa fa-copy"