Fixed: Enable entity timestamp fields.

(OFBIZ-10959) While working on a Production environment, it is found that for some reason entity timestamp fields are disabled at Search Results screen in Trunk and the previous release branch. Thanks Pawan Verma for reporting the issue and providing the patch, Jacques, Gil, Mathieu for reviewing it. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1859915 13f79535-47bb-0310-9956-ffa450edef68
apache · May 25, 2019 · 90e70dd · 90e70dd
1 parent 56d7903
commit 90e70dd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/framework/webtools/groovyScripts/entity/FindGeneric.groovy b/framework/webtools/groovyScripts/entity/FindGeneric.groovy
@@ -86,7 +86,7 @@ if (modelEntity) {
             '<field-map field-name="inputFields" from-field="parameters"/>' +
             '<field-map field-name="entityName" value="' + entityName + '"/>' +
             '</service></actions>' +
-            '<auto-fields-entity entity-name="' + entityName + '" default-field-type="display"/>' +
+            '<auto-fields-entity entity-name="' + entityName + '" default-field-type="display" include-internal="true"/>' +
             '<field name="entityName"><hidden value="' + entityName + '"/></field>' +
             '<field name="viewGeneric" title=" "><hyperlink target="ViewGeneric" description="view">' +
             '    <auto-parameters-entity entity-name="' + entityName + '"/>' +

diff --git a/framework/widget/dtd/widget-form.xsd b/framework/widget/dtd/widget-form.xsd
@@ -496,6 +496,11 @@ under the License.
                 </xs:simpleType>
             </xs:attribute>
             <xs:attribute type="xs:positiveInteger" name="default-position" default="1" />
+            <xs:attribute name="include-internal" type="xs:boolean" default="false">
+                <xs:annotation>
+                    <xs:documentation>This field will let the user enable internal fields of entity</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
         </xs:complexType>
     </xs:element>
     <xs:element name="sort-order">

diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java
@@ -758,7 +758,8 @@ private void addAutoFieldsFromEntity(AutoFieldsEntity autoFieldsEntity, ModelRea
         Iterator<ModelField> modelFieldIter = modelEntity.getFieldsIterator();
         while (modelFieldIter.hasNext()) {
             ModelField modelField = modelFieldIter.next();
-            if (modelField.getIsAutoCreatedInternal()) {
+            // auto-add only if field was generated automatically by the entity engine or including internally
+            if (modelField.getIsAutoCreatedInternal() && !autoFieldsEntity.includeInternal) {
                 // don't ever auto-add these, should only be added if explicitly referenced
                 continue;
             }
@@ -1446,11 +1447,13 @@ public static class AutoFieldsEntity {
         public final String mapName;
         public final String defaultFieldType;
         public final int defaultPosition;
+        public final boolean includeInternal;
 
         public AutoFieldsEntity(Element element) {
             this.entityName = element.getAttribute("entity-name");
             this.mapName = element.getAttribute("map-name");
             this.defaultFieldType = element.getAttribute("default-field-type");
+            this.includeInternal = !"false".equals(element.getAttribute("include-internal"));
             String positionStr = element.getAttribute("default-position");
             int position = 1;
             try {