You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mo...@apache.org on 2010/04/02 13:37:00 UTC
svn commit: r930247 - in /ofbiz/trunk/applications/accounting/widget:
AccountingPrintScreens.xml BillingAccountScreens.xml CommonScreens.xml
GlSetupScreens.xml PaymentScreens.xml TaxAuthorityScreens.xml
ap/CommonScreens.xml ar/CommonScreens.xml
Author: mor
Date: Fri Apr 2 11:36:59 2010
New Revision: 930247
URL: http://svn.apache.org/viewvc?rev=930247&view=rev
Log:
Replaced
<if-has-permission permission="ACCOUNTING" action="_VIEW"/>
with
<if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
Modified:
ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml
ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml
ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml?rev=930247&r1=930246&r2=930247&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingPrintScreens.xml Fri Apr 2 11:36:59 2010
@@ -39,7 +39,7 @@ under the License.
<section>
<condition>
<or>
- <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+ <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
<!-- can always see own invoice -->
<if-compare field="invoice.partyIdFrom" operator="equals" value="${userLogin.partyId}"/>
<if-compare field="invoice.partyId" operator="equals" value="${userLogin.partyId}"/>
@@ -85,7 +85,7 @@ under the License.
<screen name="PrintCheckPDF">
<section>
<condition>
- <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+ <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
</condition>
<actions>
<set field="titleProperty" value="AccountingPrintChecks"/>
Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml?rev=930247&r1=930246&r2=930247&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml Fri Apr 2 11:36:59 2010
@@ -30,7 +30,7 @@ under the License.
<section>
<!-- do check for ACCOUNTING, _VIEW permission -->
<condition>
- <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+ <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<section>
@@ -48,7 +48,7 @@ under the License.
<section>
<!-- do check for ACCOUNTING, _VIEW permission -->
<condition>
- <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+ <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<decorator-section-include name="body"/>
Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=930247&r1=930246&r2=930247&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Fri Apr 2 11:36:59 2010
@@ -57,7 +57,7 @@ under the License.
<decorator-section name="pre-body">
<section>
<condition>
- <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+ <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<include-menu name="PaymentTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
@@ -68,7 +68,7 @@ under the License.
<section>
<!-- do check for ACCOUNTING, _VIEW permission -->
<condition>
- <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+ <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<include-menu name="PaymentSubTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
@@ -110,7 +110,7 @@ under the License.
<section>
<condition>
<and>
- <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+ <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
<not><if-empty field="paymentGroup"/></not>
</and>
</condition>
@@ -123,7 +123,7 @@ under the License.
<section>
<!-- do check for ACCOUNTING, _VIEW permission -->
<condition>
- <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+ <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<section>
Modified: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=930247&r1=930246&r2=930247&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Fri Apr 2 11:36:59 2010
@@ -554,7 +554,7 @@ under the License.
<decorator-section name="body">
<section>
<condition>
- <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+ <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=930247&r1=930246&r2=930247&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Fri Apr 2 11:36:59 2010
@@ -31,7 +31,7 @@ under the License.
<decorator-section name="pre-body">
<section>
<condition>
- <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+ <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<include-menu name="PaymentTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
@@ -42,7 +42,7 @@ under the License.
<section>
<!-- do check for ACCOUNTING, _VIEW permission -->
<condition>
- <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+ <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<include-menu name="PaymentSubTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml?rev=930247&r1=930246&r2=930247&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml Fri Apr 2 11:36:59 2010
@@ -41,7 +41,7 @@ under the License.
<section>
<!-- do check for ACCOUNTING, _VIEW permission -->
<condition>
- <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+ <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<section>
Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=930247&r1=930246&r2=930247&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Fri Apr 2 11:36:59 2010
@@ -170,7 +170,7 @@ under the License.
<section>
<!-- do check for ACCOUNTING, _VIEW permission -->
<condition>
- <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+ <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<include-menu name="PaymentTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=930247&r1=930246&r2=930247&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Fri Apr 2 11:36:59 2010
@@ -101,7 +101,7 @@ under the License.
<section>
<!-- do check for ACCOUNTING, _VIEW permission -->
<condition>
- <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+ <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
<include-menu name="PaymentTabBar" location="component://accounting/widget/AccountingMenus.xml"/>