svn commit: r1859916 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ framework/webtools/groovyScripts/entity/FindGeneric.groovy framework/widget/dtd/widget-form.xsd framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java

[surajk]

Author: surajk
Date: Sat May 25 08:27:34 2019
New Revision: 1859916

URL: http://svn.apache.org/viewvc?rev=1859916&view=rev
Log:
Applied fix from trunk for revision: 1859915
===

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.

Modified:
    ofbiz/ofbiz-framework/branches/release18.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release18.12/framework/webtools/groovyScripts/entity/FindGeneric.groovy
    ofbiz/ofbiz-framework/branches/release18.12/framework/widget/dtd/widget-form.xsd
    ofbiz/ofbiz-framework/branches/release18.12/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java

Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 25 08:27:34 2019
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859909,1859911,1859915

Modified: ofbiz/ofbiz-framework/branches/release18.12/framework/webtools/groovyScripts/entity/FindGeneric.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/webtools/groovyScripts/entity/FindGeneric.groovy?rev=1859916&r1=1859915&r2=1859916&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/framework/webtools/groovyScripts/entity/FindGeneric.groovy (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/framework/webtools/groovyScripts/entity/FindGeneric.groovy Sat May 25 08:27:34 2019
@@ -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 + '"/>' +

Modified: ofbiz/ofbiz-framework/branches/release18.12/framework/widget/dtd/widget-form.xsd
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/widget/dtd/widget-form.xsd?rev=1859916&r1=1859915&r2=1859916&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/framework/widget/dtd/widget-form.xsd (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/framework/widget/dtd/widget-form.xsd Sat May 25 08:27:34 2019
@@ -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">

Modified: ofbiz/ofbiz-framework/branches/release18.12/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java?rev=1859916&r1=1859915&r2=1859916&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release18.12/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java (original)
+++ ofbiz/ofbiz-framework/branches/release18.12/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java Sat May 25 08:27:34 2019
@@ -758,7 +758,8 @@ public abstract class ModelForm extends
         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 abstract class ModelForm extends
         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 {