[ofbiz-framework] branch trunk updated: Improved: Add sequenceNum field on contentAssoc list (OFBIZ-12654)

[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 8ee85ec390 Improved: Add sequenceNum field on contentAssoc list 
(OFBIZ-12654)
8ee85ec390 is described below

commit 8ee85ec3906197fb50c26445c0ec928ad49fc623
Author: Nicolas Malin <nicolas.ma...@nereide.fr>
AuthorDate: Fri Jul 1 18:49:06 2022 +0200

    Improved: Add sequenceNum field on contentAssoc list (OFBIZ-12654)
    
    By the way, clean unnecessary code and change groovy scripting call by the 
native date translation
    
    Thanks to Ingo Wolfmayr for this issue
---
 applications/content/widget/content/ContentForms.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/applications/content/widget/content/ContentForms.xml 
b/applications/content/widget/content/ContentForms.xml
index d13f7a2462..53298d9745 100644
--- a/applications/content/widget/content/ContentForms.xml
+++ b/applications/content/widget/content/ContentForms.xml
@@ -299,9 +299,10 @@ under the License.
                 </sub-hyperlink>
             </display-entity>
         </field>
-        <field name="contentAssocTypeId"><display-entity 
entity-name="ContentAssocType"></display-entity></field>
+        <field name="contentAssocTypeId"><display-entity 
entity-name="ContentAssocType"/></field>
         <field name="mapKey"><display/></field>
-        <field name="fromDate"><display 
description="${groovy:fromDate.toString().substring(0,10)}"/></field>
+        <field name="sequenceNum"><display/></field>
+        <field name="fromDate"><display type="date"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
             <hyperlink description="${uiLabelMap.CommonDelete}" 
target="removeContentAssoc" also-hidden="false">
                 <parameter param-name="contentId"/>
@@ -311,7 +312,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="thruDate"><date-time/></field>
-        <field name="updateButton" title="${uiLabelMap.CommonUpdate}" 
widget-style="buttontext">
+        <field name="updateButton" widget-style="buttontext">
             <submit button-type="text-link"/>
         </field>
     </form>
@@ -330,9 +331,10 @@ under the License.
             </display-entity>
         </field>
         <field name="contentIdTo"><hidden/></field>
-        <field name="contentAssocTypeId"><display-entity 
entity-name="ContentAssocType"></display-entity></field>
+        <field name="contentAssocTypeId"><display-entity 
entity-name="ContentAssocType"/></field>
         <field name="mapKey"><display/></field>
-        <field name="fromDate"><display 
description="${groovy:fromDate.toString().substring(0,10)}"/></field>
+        <field name="sequenceNum"><display/></field>
+        <field name="fromDate"><display type="date"/></field>
         <field name="deleteLink" title=" " widget-style="buttontext">
             <hyperlink description="${uiLabelMap.CommonDelete}" 
target="removeContentAssoc" also-hidden="false">
                 <parameter param-name="contentId"/>
@@ -342,7 +344,7 @@ under the License.
             </hyperlink>
         </field>
         <field name="thruDate"><date-time/></field>
-        <field name="updateButton" title="${uiLabelMap.CommonUpdate}" 
widget-style="buttontext">
+        <field name="updateButton" widget-style="buttontext">
             <submit button-type="text-link"/>
         </field>
     </form>