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

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

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

jleroux@apache.org
Author: jleroux
Date: Sat Oct 27 08:24:35 2007
New Revision: 589134

URL: http://svn.apache.org/viewvc?rev=589134&view=rev
Log:
A patch from Adrian Crum "CommonPermissionServices doesn't display service name in permission error message" (https://issues.apache.org/jira/browse/OFBIZ-1371) - OFBIZ-1371

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=589134&r1=589133&r2=589134&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 Sat Oct 27 08:24:35 2007
@@ -51,11 +51,9 @@
         <!-- altPermission is not a required field; no need to add Error -->
 
         <!-- set up called service name -->
+        <set field="resourceDescription" from-field="parameters.resourceDescription"/>
         <if-empty field-name="resourceDescription">
-            <set field="resourceDescription" from-field="parameters.resourceDescriptionn"/>
-            <if-empty field-name="resourceDescription">
-                <property-to-field resource="CommonUiLabels" property="CommonPermissionThisOperation" field-name="resourceDescription"/>
-            </if-empty>
+            <property-to-field resource="CommonUiLabels" property="CommonPermissionThisOperation" field-name="resourceDescription"/>
         </if-empty>
 
         <!-- check permission -->