svn commit: r1831832 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/product/minilang/product/product/ applications/product/minilang/product/store/ framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/

Author: jleroux
Date: Fri May 18 08:13:40 2018
New Revision: 1831832

URL: http://svn.apache.org/viewvc?rev=1831832&view=rev
Log:
"Applied fix from trunk for revision: 1831831"
------------------------------------------------------------------------
r1831831 | jleroux | 2018-05-18 10:11:55 +0200 (ven. 18 mai 2018) | 11 lignes

Fixed:: Dynamic values not rendering properly in property tag of fail-property
attribute
(OFBIZ-10406)

While calling checkProductRelatedPermission, if permission is failed ten
fail-property tag uses ${checkActionLabel} which is not handled properly in
MessageElement.java.
There are 2-3 other occurrences as well of such type but not in working
condition.

Thanks: Suraj
------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/applications/product/minilang/product/product/ProductServices.xml
    ofbiz/ofbiz-framework/branches/release17.12/applications/product/minilang/product/store/ProductStoreServices.xml
    ofbiz/ofbiz-framework/branches/release17.12/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 18 08:13:40 2018
@@ -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:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/product/minilang/product/product/ProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/product/minilang/product/product/ProductServices.xml?rev=1831832&r1=1831831&r2=1831832&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/product/minilang/product/product/ProductServices.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/product/minilang/product/product/ProductServices.xml Fri May 18 08:13:40 2018
@@ -686,6 +686,7 @@ under the License.
             </condition>
             <then>
                 <set field="checkActionLabel" value="${groovy: 'ProductCatalog' + checkAction.charAt(0) + checkAction.substring(1).toLowerCase() + 'PermissionError'}"/>
+                <set field="resourceDescription" from-field="callingMethodName"/>
                 <add-error>
                     <fail-property resource="ProductUiLabels" property="${checkActionLabel}"/>
                 </add-error>

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/product/minilang/product/store/ProductStoreServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/product/minilang/product/store/ProductStoreServices.xml?rev=1831832&r1=1831831&r2=1831832&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/product/minilang/product/store/ProductStoreServices.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/product/minilang/product/store/ProductStoreServices.xml Fri May 18 08:13:40 2018
@@ -478,6 +478,7 @@ under the License.
             <then>
                 <log level="verbose" message="Permission check failed, user does not have permission"/>
                 <set field="checkActionLabel" value="${groovy: 'ProductCatalog' + checkAction.charAt(0) + checkAction.substring(1).toLowerCase() + 'PermissionError'}"/>
+                <set field="resourceDescription" from-field="callingMethodName"/>
                 <add-error>
                     <fail-property resource="ProductUiLabels" property="${checkActionLabel}"/>
                 </add-error>

Modified: ofbiz/ofbiz-framework/branches/release17.12/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java?rev=1831832&r1=1831831&r2=1831832&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java Fri May 18 08:13:40 2018
@@ -29,7 +29,6 @@ import org.w3c.dom.Element;
 
 /**
  * Implements the &lt;fail-message&gt; and &lt;fail-property&gt; elements.
- *
  * @see <a href="https://cwiki.apache.org/confluence/display/OFBIZ/Mini+Language+-+minilang+-+simple-method+-+Reference">Mini-language Reference</a>
  */
 public final class MessageElement extends MiniLangElement {
@@ -49,7 +48,7 @@ public final class MessageElement extend
     }
 
     private final FlexibleStringExpander messageFse;
-    private final String propertykey;
+    private final FlexibleStringExpander propertyFse;
     private final String propertyResource;
 
     public MessageElement(Element element, SimpleMethod simpleMethod) throws MiniLangException {
@@ -61,7 +60,7 @@ public final class MessageElement extend
                 MiniLangValidate.constantPlusExpressionAttributes(simpleMethod, element, "message");
             }
             this.messageFse = FlexibleStringExpander.getInstance(element.getAttribute("message"));
-            this.propertykey = null;
+            this.propertyFse = null;
             this.propertyResource = null;
         } else {
             if (MiniLangValidate.validationOn()) {
@@ -70,7 +69,7 @@ public final class MessageElement extend
                 MiniLangValidate.constantAttributes(simpleMethod, element, "property", "resource");
             }
             this.messageFse = null;
-            this.propertykey = element.getAttribute("property");
+            this.propertyFse = FlexibleStringExpander.getInstance(element.getAttribute("property"));
             this.propertyResource = element.getAttribute("resource");
         }
     }
@@ -79,7 +78,7 @@ public final class MessageElement extend
         if (messageFse != null) {
             return messageFse.expandString(methodContext.getEnvMap());
         } else {
-            return UtilProperties.getMessage(propertyResource, propertykey, methodContext.getEnvMap(), methodContext.getLocale());
+            return UtilProperties.getMessage(propertyResource, propertyFse.expandString(methodContext.getEnvMap()), methodContext.getEnvMap(), methodContext.getLocale());
         }
     }
 
@@ -89,8 +88,8 @@ public final class MessageElement extend
         if (this.messageFse != null) {
             sb.append("<fail-message message=\"").append(this.messageFse).append("\" />");
         }
-        if (this.propertykey != null) {
-            sb.append("<fail-property property=\"").append(this.propertykey).append(" resource=\"").append(this.propertyResource).append("\" />");
+        if (this.propertyFse != null) {
+            sb.append("<fail-property property=\"").append(this.propertyFse).append(" resource=\"").append(this.propertyResource).append("\" />");
         }
         return sb.toString();
     }