Author: jleroux
Date: Mon Dec 22 09:13:12 2014
New Revision: 1647266
URL: http://svn.apache.org/r1647266
Log:
A patch from Deepak for "Incorrect use of if-has-permission tag"
https://issues.apache.org/jira/browse/OFBIZ-5920
Deepak: here is the patch for this issue, found some more places where
if-has-permission tag used in different way, will create a new ticket to fix
the if-has-permission tags and will used the consistent pattern.
jleroux: I wonder if this commit does not fix some other already reported
issues, anyway it's good!
Modified:
ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml
ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml
Modified: ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml?rev=1647266&r1=1647265&r2=1647266&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml
(original)
+++ ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml Mon Dec
22 09:13:12 2014
@@ -139,7 +139,7 @@
<if-compare
field="workEffort.currentStatusId" operator="not-equals" value="CAL_CANCELLED"/>
</and>
<if-empty field="workEffort"/>
- <if-has-permission permission="WORKEFFORTMGR"
action="ADMIN"/>
+ <if-has-permission permission="WORKEFFORTMGR"
action="_ADMIN"/>
</or>
<if-compare field="parameters.form"
operator="equals" value="edit"/>
</and>
Modified: ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml?rev=1647266&r1=1647265&r2=1647266&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml Mon Dec 22
09:13:12 2014
@@ -167,7 +167,7 @@ under the License.
<if-compare field="isCalOwner"
operator="equals" value="true" type="Boolean" />
</and>
<if-empty field="workEffort" />
- <if-has-permission permission="WORKEFFORTMGR"
action="ADMIN" />
+ <if-has-permission permission="WORKEFFORTMGR"
action="_ADMIN" />
</or>
</condition>
<actions>
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml?rev=1647266&r1=1647265&r2=1647266&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml Mon Dec 22
09:13:12 2014
@@ -85,7 +85,7 @@ under the License.
<label style="head1"
text="${uiLabelMap.EcommerceMessageListForForum} ${forum.description}"/>
<section>
<condition>
- <if-has-permission
permission="CONTENTMGR" action="CREATE"/>
+ <if-has-permission
permission="CONTENTMGR" action="_CREATE"/>
</condition>
<widgets>
<!-- old link converted during URLs
securing, seems busted... no time to look at detail...-->
@@ -137,7 +137,7 @@ under the License.
</container>
<section>
<condition>
- <if-has-permission permission="CONTENTMGR"
action="CREATE"/>
+ <if-has-permission permission="CONTENTMGR"
action="_CREATE"/>
</condition>
<widgets>
<label
style="blogheader">${uiLabelMap.EcommerceBlogAddResponse}</label>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml?rev=1647266&r1=1647265&r2=1647266&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml
(original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/CustRequestScreens.xml Mon Dec
22 09:13:12 2014
@@ -24,7 +24,7 @@ under the License.
<screen name="ProjectRequestList">
<section>
<condition>
- <if-has-permission permission="PROJECTMGR" action="ADMIN"/>
+ <if-has-permission permission="PROJECTMGR" action="_ADMIN"/>
</condition>
<actions>
<entity-and list="custRequests" entity-name="CustRequest">
