[ofbiz-framework] branch trunk updated: Fixed: Fix missing else during previous refactoring (OFBIZ-11253) When you rendering for with auto-field-entity on edit mode, indicator field has been override by text field. Fix also two error on source field type set to FieldInfo.SOURCE_AUTO_SERVICE instead of FieldInfo.SOURCE_AUTO_ENTITY

[nmalin]

This is an automated email from the ASF dual-hosted git repository.

nmalin pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 071a742  Fixed: Fix missing else during previous refactoring (OFBIZ-11253) When you rendering for with auto-field-entity on edit mode, indicator field has been override by text field. Fix also two error on source field type set to FieldInfo.SOURCE_AUTO_SERVICE instead of FieldInfo.SOURCE_AUTO_ENTITY
071a742 is described below

commit 071a74238b4d53fb95ffd214e0e68e55840a28e3
Author: Nicolas Malin <[hidden email]>
AuthorDate: Fri Dec 6 21:29:01 2019 +0100

    Fixed: Fix missing else during previous refactoring
    (OFBIZ-11253)
    When you rendering for with auto-field-entity on edit mode, indicator field has been override by text field.
    Fix also two error on source field type set to FieldInfo.SOURCE_AUTO_SERVICE instead of FieldInfo.SOURCE_AUTO_ENTITY
   
    Thanks to Olivier Heintz to inform on the regression.
---
 .../java/org/apache/ofbiz/widget/model/ModelFormFieldBuilder.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormFieldBuilder.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormFieldBuilder.java
index a59ca45..18fad7b 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormFieldBuilder.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormFieldBuilder.java
@@ -586,10 +586,10 @@ public class ModelFormFieldBuilder {
                 this.setFieldInfo(textField);
             }
         } else if ("display".equals(defaultFieldType)) {
-            ModelFormField.DisplayField displayField = new ModelFormField.DisplayField(FieldInfo.SOURCE_AUTO_SERVICE, null);
+            ModelFormField.DisplayField displayField = new ModelFormField.DisplayField(FieldInfo.SOURCE_AUTO_ENTITY, null);
             this.setFieldInfo(displayField);
         } else if ("hidden".equals(defaultFieldType)) {
-            ModelFormField.HiddenField hiddenField = new ModelFormField.HiddenField(FieldInfo.SOURCE_AUTO_SERVICE, null);
+            ModelFormField.HiddenField hiddenField = new ModelFormField.HiddenField(FieldInfo.SOURCE_AUTO_ENTITY, null);
             this.setFieldInfo(hiddenField);
         } else {
             if ("indicator".equals(fieldType)) {
@@ -602,7 +602,7 @@ public class ModelFormFieldBuilder {
             } else if ("very-long".equals(fieldType)) {
                 ModelFormField.TextareaField textareaField = new ModelFormField.TextareaField(FieldInfo.SOURCE_AUTO_ENTITY, null);
                 this.setFieldInfo(textareaField);
-            } if (textFieldTypes.contains(fieldType)) {
+            } else if (textFieldTypes.contains(fieldType)) {
                 ModelFormField.TextField textField = new ModelFormField.TextField(FieldInfo.SOURCE_AUTO_ENTITY,
                         textSizeByFieldTypes.get(fieldType), textMaxSizeByFieldTypes.get(fieldType), null);
                 this.setFieldInfo(textField);