fixed

Issue #607
imixs · Sep 14, 2024 · dcf6494 · dcf6494
1 parent 64480e5
commit dcf6494
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/...ice-workflow-util/src/main/java/org/imixs/workflow/office/forms/CustomFormController.java b/...ice-workflow-util/src/main/java/org/imixs/workflow/office/forms/CustomFormController.java
@@ -135,11 +135,7 @@ public void onWorkflowEvent(@Observes WorkflowEvent workflowEvent) throws ModelE
      */
     public void computeFieldDefinition(ItemCollection workitem) throws ModelException {
         logger.fine("---> computeFieldDefinition");
-        String content = workitem.getItemValueString("txtWorkflowEditorCustomForm");
-        if (content.isEmpty()) {
-            // no custom form definition found, try to load a new one....
-            content = customFormService.updateCustomFieldDefinition(workitem);
-        }
+        String content = customFormService.updateCustomFieldDefinition(workitem);
         sections = new ArrayList<CustomFormSection>();
         if (!content.isEmpty()) {
             // start parsing....

diff --git a/...office-workflow-util/src/main/java/org/imixs/workflow/office/forms/CustomFormService.java b/...office-workflow-util/src/main/java/org/imixs/workflow/office/forms/CustomFormService.java
@@ -100,16 +100,22 @@ public void onWorkflowEvent(@Observes ProcessingEvent processingEvent) throws Mo
     /**
      * This method updates the custom Field Definition based on a given workitem.
      * The method first looks if the model contains a custom definition and stores
-     * the data into the field txtWorkflowEditorCustomForm
+     * the data into the field txtWorkflowEditorCustomForm.
+     * <p>
+     * In case the model does not provide a custom Field Definition but the workitem
+     * has stored one the method returns the existing one and did not update the
+     * item 'txtWorkflowEditorCustomForm'
      * 
      * @return
      * @throws ModelException
      */
     public String updateCustomFieldDefinition(ItemCollection workitem) throws ModelException {
         logger.fine("---> updateCustomFieldDefinition");
         String content = fetchFormDefinitionFromModel(workitem);
-        if (!content.isEmpty()) {
-            // store the new content
+        if (content.isEmpty()) {
+            // take the existing one to be returned...
+            content = workitem.getItemValueString("txtWorkflowEditorCustomForm");
+        } else {
             workitem.replaceItemValue("txtWorkflowEditorCustomForm", content);
         }
         return content;