svn commit: r1831833 - in /ofbiz/branches/release16.11: ./ applications/product/minilang/
Locked
svn commit: r1831833 - in /ofbiz/branches/release16.11: ./ applications/product/minilang/
 
|
Author: jleroux
Date: Fri May 18 08:13:42 2018 New Revision: 1831833 URL: http://svn.apache.org/viewvc?rev=1831833&view=rev Log: "Applied fix from trunk framework 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/branches/release16.11/ (props changed) ofbiz/branches/release16.11/applications/product/minilang/product/product/ProductServices.xml ofbiz/branches/release16.11/applications/product/minilang/product/store/ProductStoreServices.xml ofbiz/branches/release16.11/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java Propchange: ofbiz/branches/release16.11/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri May 18 08:13:42 2018 @@ -10,5 +10,5 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291, 1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825233,1825262,1825444,1825450,1826374,1826592,1826671,1826805,1826938,1828255,1830936,1831234,1831608 +/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291, 1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825233,1825262,1825444,1825450,1826374,1826592,1826671,1826805,1826938,1828255,1830936,1831234,1831608,1831831 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520 Modified: ofbiz/branches/release16.11/applications/product/minilang/product/product/ProductServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/minilang/product/product/ProductServices.xml?rev=1831833&r1=1831832&r2=1831833&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/minilang/product/product/ProductServices.xml (original) +++ ofbiz/branches/release16.11/applications/product/minilang/product/product/ProductServices.xml Fri May 18 08:13:42 2018 @@ -680,6 +680,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/branches/release16.11/applications/product/minilang/product/store/ProductStoreServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/minilang/product/store/ProductStoreServices.xml?rev=1831833&r1=1831832&r2=1831833&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/product/minilang/product/store/ProductStoreServices.xml (original) +++ ofbiz/branches/release16.11/applications/product/minilang/product/store/ProductStoreServices.xml Fri May 18 08:13:42 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/branches/release16.11/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java?rev=1831833&r1=1831832&r2=1831833&view=diff ============================================================================== --- ofbiz/branches/release16.11/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java (original) +++ ofbiz/branches/release16.11/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MessageElement.java Fri May 18 08:13:42 2018 @@ -29,7 +29,6 @@ import org.w3c.dom.Element; /** * Implements the <fail-message> and <fail-property> elements. - * * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{<failmessage>}}">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(); } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |