Author: jleroux
Date: Fri Mar 22 10:55:11 2013
New Revision: 1459709
URL: http://svn.apache.org/r1459709
Log:
"Applied fix from trunk for revision: 1459220"
------------------------------------------------------------------------
r1459220 | mor | 2013-03-21 11:38:28 +0100 (jeu., 21 mars 2013) | 1 line
Slightly different patch to fix the auto save cart functionality for anonymous
user reported by Mirko on OFBIZ-5157.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1459220
Modified:
ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml?rev=1459709&r1=1459708&r2=1459709&view=diff
==============================================================================
---
ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
(original)
+++
ofbiz/branches/release11.04/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml
Fri Mar 22 10:55:11 2013
@@ -119,7 +119,19 @@ under the License.
<if-empty field="shoppingListItems">
<set field="parentMethodName" value="createShoppingListItem"/>
<set field="permissionAction" value="CREATE"/>
- <call-simple-method method-name="checkShoppingListItemSecurity"/>
+ <entity-one entity-name="ShoppingList" value-field="shoppingList"/>
+ <if>
+ <condition>
+ <and>
+ <not><if-empty field="shoppingList.partyId"/></not>
+ <not><if-compare-field field="userLogin.partyId"
to-field="shoppingList.partyId" operator="equals"/></not>
+ <not><if-has-permission permission="PARTYMGR"
action="_${permissionAction}"/></not>
+ </and>
+ </condition>
+ <then>
+ <add-error><fail-property resource="OrderErrorUiLabels"
property="OrderSecurityErrorToRunForAnotherParty"/></add-error>
+ </then>
+ </if>
<check-errors/>
<entity-one entity-name="ShoppingList" value-field="shoppingList"/>
