Author: deepak
Date: Tue May 15 06:21:47 2018
New Revision: 1831609
URL: http://svn.apache.org/viewvc?rev=1831609&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/ofbiz-framework/branches/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/applications/order/servicedef/services.xml
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 15 06:21:47 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
+/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
Modified:
ofbiz/ofbiz-framework/branches/release17.12/applications/order/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/order/servicedef/services.xml?rev=1831609&r1=1831608&r2=1831609&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release17.12/applications/order/servicedef/services.xml
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/applications/order/servicedef/services.xml
Tue May 15 06:21:47 2018
@@ -653,14 +653,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>
@@ -669,7 +669,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"/>
@@ -688,7 +688,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>
@@ -703,7 +703,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>
@@ -712,7 +712,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"/>
@@ -721,7 +721,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"/>
@@ -729,7 +729,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>
