Remove redundant MassImport Facelets

kitodo · May 11, 2022 · 058236c · 058236c
1 parent ae0c3d2
commit 058236c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 106 deletions.
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/massImport/fileMassImport.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/massImport/fileMassImport.xhtml
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/massImport/massImportTab.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/massImport/massImportTab.xhtml
@@ -25,15 +25,16 @@
                                value="#{msgs['newProcess.catalogueSearch.catalogue']}"/>
                 <p:selectOneMenu id="catalogueSelect"
                                  required="#{not empty param['editForm:importButton']}"
-                                 value="#{MassImportForm.selectedCatalog}">
+                                 converter="#{importConfigurationConverter}"
+                                 value="#{MassImportForm.importConfigurationId}">
                     <f:selectItem itemValue="#{null}"
                                   itemLabel="-- #{msgs.selectCatalog} --"
                                   noSelectionOption="true"
                                   itemDisabled="true"/>
-                    <f:selectItems value="#{CreateProcessForm.catalogImportDialog.catalogs}"
-                                   var="catalog"
-                                   itemLabel="#{catalog}"
-                                   itemValue="#{catalog}"/>
+                    <f:selectItems value="#{CreateProcessForm.catalogImportDialog.importConfigurations}"
+                                   var="configuration"
+                                   itemLabel="#{configuration.title}"
+                                   itemValue="#{configuration}"/>
                     <p:ajax update="editForm"/>
                 </p:selectOneMenu>
             </div>
@@ -100,12 +101,12 @@
             </div>
         </p:row>
         <p:row>
-            <h:panelGroup rendered="#{MassImportForm.selectedCatalog ne null}">
+            <h:panelGroup rendered="#{MassImportForm.importConfigurationId ne null}">
                 <p:outputLabel for="csvFileUpload"
                                value="#{msgs['csvFileUpload']}"/>
                 <p:fileUpload id="csvFileUpload"
                               value="#{MassImportForm.file}"
-                              rendered="#{MassImportForm.selectedCatalog ne null}"
+                              rendered="#{MassImportForm.importConfigurationId ne null}"
                               listener="#{MassImportForm.handleFileUpload}"
                               allowTypes="/(\.|\/)(csv)$/"
                               skinSimple="true"

diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/massImport/textMassImport.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/massImport/textMassImport.xhtml