Author: mor
Date: Fri Apr 2 11:45:14 2010
New Revision: 930248
URL: http://svn.apache.org/viewvc?rev=930248&view=rev
Log:
Replaced
<if-has-permission permission="PARTYMGR" action="_VIEW"/>
with
<if-service-permission service-name="partyBasePermissionCheck"
main-action="VIEW"/>
Modified:
ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml
ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/VisitScreens.xml
ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
Modified: ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml?rev=930248&r1=930247&r2=930248&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml
(original)
+++ ofbiz/trunk/applications/commonext/widget/ofbizsetup/CommonScreens.xml Fri
Apr 2 11:45:14 2010
@@ -65,7 +65,7 @@
<section>
<condition>
<and>
- <if-has-permission permission="PARTYMGR"
action="_VIEW"/>
+ <if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
<not><if-empty field="party"/></not>
</and>
</condition>
@@ -78,7 +78,7 @@
<section>
<!-- do check for PARTYMGR, _VIEW permission -->
<condition>
- <if-has-permission permission="PARTYMGR"
action="_VIEW"/>
+ <if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<section>
Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=930248&r1=930247&r2=930248&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Fri Apr 2
11:45:14 2010
@@ -313,7 +313,7 @@ under the License.
<decorator-section name="body">
<section>
<condition>
- <if-has-permission permission="PARTYMGR"
action="_VIEW"/>
+ <if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
</condition>
<!-- do check for PARTYMGR, _VIEW permission -->
<widgets>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=930248&r1=930247&r2=930248&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Fri Apr 2
11:45:14 2010
@@ -163,7 +163,7 @@ under the License.
<section>
<!-- do check for PARTYMGR, _VIEW permission -->
<condition>
- <if-has-permission permission="PARTYMGR"
action="_VIEW"/>
+ <if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<section>
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=930248&r1=930247&r2=930248&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Fri Apr 2
11:45:14 2010
@@ -70,7 +70,7 @@ under the License.
<section>
<condition>
<and>
- <if-has-permission permission="PARTYMGR"
action="_VIEW"/>
+ <if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
<not><if-empty field="party"/></not>
</and>
</condition>
@@ -83,7 +83,7 @@ under the License.
<section>
<!-- do check for PARTYMGR, _VIEW permission -->
<condition>
- <if-has-permission permission="PARTYMGR"
action="_VIEW"/>
+ <if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<section>
Modified:
ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml?rev=930248&r1=930247&r2=930248&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml
(original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml
Fri Apr 2 11:45:14 2010
@@ -33,7 +33,7 @@ under the License.
<section>
<condition>
<and>
- <if-has-permission permission="PARTYMGR"
action="_VIEW"/>
+ <if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
<not><if-empty
field="partyInvitation"/></not>
</and>
</condition>
@@ -46,7 +46,7 @@ under the License.
<section>
<!-- do check for PARTYMGR, _VIEW permission -->
<condition>
- <if-has-permission permission="PARTYMGR"
action="_VIEW"/>
+ <if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<section>
@@ -80,7 +80,7 @@ under the License.
<decorator-section name="body">
<section>
<condition>
- <if-has-permission permission="PARTYMGR"
action="_VIEW"/>
+ <if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
@@ -118,7 +118,7 @@ under the License.
<decorator-section name="body">
<section>
<condition>
- <if-has-permission permission="PARTYMGR"
action="_VIEW"/>
+ <if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<screenlet
title="${uiLabelMap[titleProperty]}}">
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=930248&r1=930247&r2=930248&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Fri Apr 2
11:45:14 2010
@@ -28,7 +28,7 @@
<menu-item name="classification"
title="${uiLabelMap.PartyClassifications}"><link
target="showclassgroups"/></menu-item>
<menu-item name="security" title="${uiLabelMap.CommonSecurity}">
<condition>
- <if-has-permission permission="PARTYMGR" action="_VIEW"/>
+ <if-service-permission service-name="partyBasePermissionCheck"
main-action="VIEW"/>
</condition>
<link target="FindSecurityGroup"/>
</menu-item>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml?rev=930248&r1=930247&r2=930248&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml Fri Apr 2
11:45:14 2010
@@ -37,7 +37,7 @@ under the License.
<section>
<!-- do check for PARTYMGR, _VIEW permission -->
<condition>
- <if-has-permission permission="PARTYMGR"
action="_VIEW"/>
+ <if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<platform-specific>
Modified:
ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml?rev=930248&r1=930247&r2=930248&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml
(original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml Fri
Apr 2 11:45:14 2010
@@ -133,7 +133,7 @@ under the License.
<section>
<!-- do check for PARTYMGR, _VIEW permission -->
<condition>
- <if-has-permission permission="PARTYMGR"
action="_VIEW"/>
+ <if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<screenlet
title="${uiLabelMap.PageTitleEditAvsOverride}">
Modified: ofbiz/trunk/applications/party/widget/partymgr/VisitScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/VisitScreens.xml?rev=930248&r1=930247&r2=930248&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/VisitScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/VisitScreens.xml Fri Apr 2
11:45:14 2010
@@ -36,7 +36,7 @@ under the License.
<section>
<!-- do check for PARTYMGR, _VIEW permission -->
<condition>
- <if-has-permission permission="PARTYMGR"
action="_VIEW"/>
+ <if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<platform-specific>
@@ -67,7 +67,7 @@ under the License.
<section>
<!-- do check for PARTYMGR, _VIEW permission -->
<condition>
- <if-has-permission permission="PARTYMGR"
action="_VIEW"/>
+ <if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<platform-specific>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml?rev=930248&r1=930247&r2=930248&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml Fri Apr 2
11:45:14 2010
@@ -25,7 +25,7 @@
<section>
<condition>
<or>
- <if-has-permission permission="PARTYMGR" action="_VIEW"/>
+ <if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
</or>
</condition>
<actions>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=930248&r1=930247&r2=930248&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Fri Apr 2
11:45:14 2010
@@ -850,7 +850,7 @@ under the License.
<section>
<!-- do check for PARTYMGR, _VIEW permission -->
<condition>
- <if-has-permission permission="PARTYMGR"
action="_VIEW"/>
+ <if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<platform-specific>
@@ -881,7 +881,7 @@ under the License.
<section>
<!-- do check for PARTYMGR, _VIEW permission -->
<condition>
- <if-has-permission permission="PARTYMGR"
action="_VIEW"/>
+ <if-service-permission
service-name="partyBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<platform-specific>
