[ofbiz-framework] branch release17.12 updated (a5e9676 -> a1e495d)

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

jleroux pushed a change to branch release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.


    from a5e9676  Fixed: ViewQuoteProfit shows fields in wrong order. (OFBIZ-11680) Thanks Pierre for reporting and Lalit Dashora for providing the patch.
     new 4a26aec  Fixed: Use from-field pattern instead of value=${***} pattern in 'set' element (OFBIZ-9607)
     new a1e495d  Fixed: issue put in with r1160964 (9 years, 5 months ago)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 applications/content/widget/contentsetup/ContentSetupForms.xml | 4 ++--
 applications/content/widget/forum/ForumScreens.xml             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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

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

commit 4a26aecbf53d9ec03c77451cbe489cfc2d7d61c4
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Sat Feb 13 17:55:29 2021 +0100

    Fixed: Use from-field pattern instead of value=${***} pattern in 'set' element (OFBIZ-9607)
   
    Fixes a syntax issue spotted while testing FreeMarker 2.3.31
---
 applications/content/widget/forum/ForumScreens.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/content/widget/forum/ForumScreens.xml b/applications/content/widget/forum/ForumScreens.xml
index 23ba20e..f8bef82 100644
--- a/applications/content/widget/forum/ForumScreens.xml
+++ b/applications/content/widget/forum/ForumScreens.xml
@@ -26,7 +26,7 @@ under the License.
             <actions>
                 <set field="headerItem" value="Forum"/>
                 <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="pageTitle" from-field="uiLabelMap.[titleProperty]"/>
+                <set field="pageTitle" from-field="uiLabelMap.${titleProperty}"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">

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

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

commit a1e495de198188ac441a6cfd47f5c92c5f466b8e
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Sat Feb 13 18:07:23 2021 +0100

    Fixed: issue put in with r1160964 (9 years, 5 months ago)
   
    Fixes a syntax issue spotted while testing FreeMarker 2.3.31
---
 applications/content/widget/contentsetup/ContentSetupForms.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/content/widget/contentsetup/ContentSetupForms.xml b/applications/content/widget/contentsetup/ContentSetupForms.xml
index b3b4db7..355cc84 100644
--- a/applications/content/widget/contentsetup/ContentSetupForms.xml
+++ b/applications/content/widget/contentsetup/ContentSetupForms.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="http://ofbiz.apache.org/Widget-Form" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Form http://ofbiz.apache.org/dtds/widget-form.xsd">
     <!-- ContentType forms -->
     <form name="AddContentType" target="addContentType" title="" type="single"
@@ -214,7 +214,7 @@ under the License.
     <form name="UpdateContentPurposeOperation" target="" title="" type="list" list-name="contentList"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
-            <entity-one entity-name="ContentPurposeOperation" use-cache="false"/>
+            <entity-condition entity-name="ContentPurposeOperation" use-cache="false"/>
         </actions>
         <auto-fields-service service-name="updateContentPurposeOperation" default-field-type="display"/>
         <field name="deleteLink" title=" " widget-style="buttontext">