Author: deepak
Date: Tue May 15 06:22:01 2018
New Revision: 1831610
URL: http://svn.apache.org/viewvc?rev=1831610&view=rev
Log:
Applied fix from trunk for revision: 1831608
===
Fixed: Wrong permission action leads to error
(OFBIZ-10405)
Thanks Suraj Khurana for your contribution
Modified:
ofbiz/branches/release16.11/ (props changed)
ofbiz/branches/release16.11/applications/order/servicedef/services.xml
Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 15 06:22:01 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
+/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/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/order/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/servicedef/services.xml?rev=1831610&r1=1831609&r2=1831610&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/servicedef/services.xml
(original)
+++ ofbiz/branches/release16.11/applications/order/servicedef/services.xml Tue
May 15 06:22:01 2018
@@ -652,14 +652,14 @@ under the License.
<service name="createCommunicationEventOrder"
default-entity-name="CommunicationEventOrder" engine="entity-auto"
invoke="create" auth="true">
<description>Create a Communication Event Order</description>
<required-permissions join-type="AND">
- <check-permission permission="ORDERMGR" action="CREATE"/>
+ <check-permission permission="ORDERMGR" action="_CREATE"/>
</required-permissions>
<auto-attributes entity-name="CommunicationEventOrder" include="pk"
mode="IN"/>
</service>
<service name="removeCommunicationEventOrder"
default-entity-name="CommunicationEventOrder" engine="entity-auto"
invoke="delete" auth="true">
<description>Remove a Communication Event Order</description>
<required-permissions join-type="AND">
- <check-permission permission="ORDERMGR" action="DELETE"/>
+ <check-permission permission="ORDERMGR" action="_DELETE"/>
</required-permissions>
<auto-attributes entity-name="CommunicationEventOrder" include="pk"
mode="IN"/>
</service>
@@ -668,7 +668,7 @@ under the License.
<service name="createOrderItemShipGroup"
default-entity-name="OrderItemShipGroup" engine="entity-auto" invoke="create"
auth="true">
<description>Creates a new OrderItemShipGroup.</description>
<required-permissions join-type="AND">
- <check-permission permission="ORDERMGR" action="CREATE"/>
+ <check-permission permission="ORDERMGR" action="_CREATE"/>
</required-permissions>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
<attribute name="orderId" type="String" mode="IN" optional="false"/>
@@ -687,7 +687,7 @@ under the License.
<service name="createOrderContactMech"
default-entity-name="OrderContactMech" engine="entity-auto" invoke="create"
auth="true">
<description>Create Order Contact Mech</description>
<required-permissions join-type="AND">
- <check-permission permission="ORDERMGR" action="CREATE"/>
+ <check-permission permission="ORDERMGR" action="_CREATE"/>
</required-permissions>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
@@ -702,7 +702,7 @@ under the License.
<service name="removeOrderContactMech"
default-entity-name="OrderContactMech" engine="entity-auto" invoke="delete"
auth="true">
<description>Remove Order Contact Mech</description>
<required-permissions join-type="AND">
- <check-permission permission="ORDERMGR" action="DELETE"/>
+ <check-permission permission="ORDERMGR" action="_DELETE"/>
</required-permissions>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
@@ -711,7 +711,7 @@ under the License.
<service name="createOrderTerm" default-entity-name="OrderTerm"
engine="entity-auto" invoke="create" auth="true">
<description>Create an Order Term</description>
<required-permissions join-type="AND">
- <check-permission permission="ORDERMGR" action="CREATE"/>
+ <check-permission permission="ORDERMGR" action="_CREATE"/>
</required-permissions>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
@@ -720,7 +720,7 @@ under the License.
<service name="updateOrderTerm" default-entity-name="OrderTerm"
engine="entity-auto" invoke="update" auth="true">
<description>Update an Order Term</description>
<required-permissions join-type="AND">
- <check-permission permission="ORDERMGR" action="UPDATE"/>
+ <check-permission permission="ORDERMGR" action="_UPDATE"/>
</required-permissions>
<auto-attributes entity-name="OrderTerm" include="pk" mode="IN"
optional="false"/>
<auto-attributes entity-name="OrderTerm" include="nonpk" mode="IN"
optional="true"/>
@@ -728,7 +728,7 @@ under the License.
<service name="removeOrderTerm" default-entity-name="OrderTerm"
engine="entity-auto" invoke="delete" auth="true">
<description>Remove an Order Term</description>
<required-permissions join-type="AND">
- <check-permission permission="ORDERMGR" action="DELETE"/>
+ <check-permission permission="ORDERMGR" action="_DELETE"/>
</required-permissions>
<auto-attributes entity-name="OrderTerm" include="pk" mode="IN"
optional="false"/>
</service>
