Add Java methods to determine whether global or task specific metadat…

…a editor layout settings have been loaded or not
effective-webwork · Dec 19, 2024 · 8d74e64 · 8d74e64
1 parent 288384d
commit 8d74e64
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 9 deletions.
diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/dataeditor/DataEditorForm.java b/Kitodo/src/main/java/org/kitodo/production/forms/dataeditor/DataEditorForm.java
@@ -231,6 +231,9 @@ public class DataEditorForm implements MetadataTreeTableInterface, RulesetSetupI
     static final String GROWL_MESSAGE =
             "PF('notifications').renderMessage({'summary':'SUMMARY','detail':'DETAIL','severity':'SEVERITY'});";
 
+    private boolean globalLayoutLoaded = false;
+    private boolean taskLayoutLoaded = false;
+
     /**
      * Public constructor.
      */
@@ -405,6 +408,14 @@ private void loadDataEditorSettings() {
             dataEditorSetting.setUserId(userId);
             dataEditorSetting.setTaskId(taskId);
         }
+
+        // initialize flags to signal whether global or task specific settings have been loaded or not
+        boolean layoutLoaded = (dataEditorSetting.getStructureWidth() > 0
+                || dataEditorSetting.getMetadataWidth() > 0
+                || dataEditorSetting.getGalleryWidth() > 0);
+
+        globalLayoutLoaded = Objects.isNull(dataEditorSetting.getTaskId()) && layoutLoaded;
+        taskLayoutLoaded = Objects.nonNull(dataEditorSetting.getTaskId()) && layoutLoaded;
     }
 
     /**
@@ -1400,4 +1411,22 @@ public String getGroupDisplayLabel(MetadataGroup metadataGroup) {
             return "";
         }
     }
+
+    /**
+     * Get value of 'globalLayoutLoaded'.
+     *
+     * @return value of 'globalLayoutLoaded'
+     */
+    public boolean isGlobalLayoutLoaded() {
+        return globalLayoutLoaded;
+    }
+
+    /**
+     * Get value of 'taskLayoutLoaded'.
+     *
+     * @return value of 'taskLayoutLoaded'
+     */
+    public boolean isTaskLayoutLoaded() {
+        return taskLayoutLoaded;
+    }
 }
diff --git a/...main/webapp/WEB-INF/templates/includes/metadataEditor/dialogs/dataEditorSettingMenu.xhtml b/...main/webapp/WEB-INF/templates/includes/metadataEditor/dialogs/dataEditorSettingMenu.xhtml
@@ -16,10 +16,6 @@
         xmlns:h="http://xmlns.jcp.org/jsf/html"
         xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
         xmlns:p="http://primefaces.org/ui">
-    <ui:param name="layoutWasLoaded" value="#{
-        DataEditorForm.dataEditorSetting.structureWidth gt 0 or
-        DataEditorForm.dataEditorSetting.metadataWidth gt 0 or
-        DataEditorForm.dataEditorSetting.galleryWidth gt 0}"/>
     <p:overlayPanel for="metadataEditorLayoutButtonForm:open" style="display: none;">
         <h:form id="metadataEditorLayoutForm">
             <ul>
@@ -34,14 +30,14 @@
                         <h:outputText value="#{msgs['dataEditor.layoutMenuSaveDefaultText']}" />
                         <h:outputText 
                             value=" (#{msgs['dataEditor.layoutMenuActiveText']})" 
-                            rendered="#{DataEditorForm.dataEditorSetting.taskId eq null and layoutWasLoaded}" />                 
+                            rendered="#{DataEditorForm.isGlobalLayoutLoaded()}" />
                     </p:commandLink>
                     <p:commandButton 
                         id="removeDefault"
                         icon="fa fa-trash" 
                         action="#{DataEditorForm.deleteDataEditorSetting()}"
                         update="metadataEditorLayoutForm dataEditorSavingResultForm"
-                        disabled="#{DataEditorForm.templateTask ne null or not layoutWasLoaded}" 
+                        disabled="#{not DataEditorForm.isGlobalLayoutLoaded()}"
                         styleClass="secondary" 
                         title="#{msgs['dataEditor.layoutMenuDeleteTitle']}" />
                 </li>
@@ -56,15 +52,15 @@
                         <h:outputText value="#{msgs['dataEditor.layoutMenuSaveForTaskText']}" />
                         <h:outputText 
                             value=" (#{msgs['dataEditor.layoutMenuActiveText']})" 
-                            rendered="#{DataEditorForm.dataEditorSetting.taskId ne null and layoutWasLoaded}" />
+                            rendered="#{DataEditorForm.isTaskLayoutLoaded()}" />
                     </p:commandLink>
                     <p:commandButton 
                         id="removeForTask"
                         icon="fa fa-trash" 
                         action="#{DataEditorForm.deleteDataEditorSetting()}"
                         update="metadataEditorLayoutForm dataEditorSavingResultForm"
-                        disabled="#{DataEditorForm.dataEditorSetting.taskId eq null or not layoutWasLoaded}" 
-                        styleClass="secondary" 
+                        disabled="#{not DataEditorForm.isTaskLayoutLoaded()}"
+                        styleClass="secondary"
                         title="#{msgs['dataEditor.layoutMenuDeleteTitle']}" />
                 </li>
             </ul>