svn commit: r586453 - /ofbiz/trunk/framework/common/script/org/ofbiz/common/permission/CommonPermissionServices.xml

[jacopoc]

Author: jacopoc
Date: Fri Oct 19 06:46:20 2007
New Revision: 586453

URL: http://svn.apache.org/viewvc?rev=586453&view=rev
Log:
Applied patch from Adrian Crum to remove redundant permission checks.
OFBIZ-1353

Modified:
    ofbiz/trunk/framework/common/script/org/ofbiz/common/permission/CommonPermissionServices.xml

Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/permission/CommonPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/permission/CommonPermissionServices.xml?rev=586453&r1=586452&r2=586453&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/permission/CommonPermissionServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/permission/CommonPermissionServices.xml Fri Oct 19 06:46:20 2007
@@ -62,10 +62,9 @@
         <if>
             <condition>
                 <or>
-                    <if-has-permission permission="${primaryPermission}_ADMIN"/>
+                    <!-- Permission checks include _ADMIN -->
                     <if-has-permission permission="${primaryPermission}" action="_${parameters.mainAction}"/>
                     <if-has-permission permission="${altPermission}" action="_${parameters.mainAction}"/>
-                    <if-has-permission permission="${altPermission}_ADMIN"/>
                 </or>
             </condition>
             <then>