svn commit: r930243 - in /ofbiz/trunk/applications/accounting: servicedef/services_perm.xml widget/LookupScreens.xml

[mor-2]

Author: mor
Date: Fri Apr  2 11:22:44 2010
New Revision: 930243

URL: http://svn.apache.org/viewvc?rev=930243&view=rev
Log:
Added a new base permission in accounting component. Used the new permission service for permission checking in the lookup screens.

Modified:
    ofbiz/trunk/applications/accounting/servicedef/services_perm.xml
    ofbiz/trunk/applications/accounting/widget/LookupScreens.xml

Modified: ofbiz/trunk/applications/accounting/servicedef/services_perm.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/servicedef/services_perm.xml?rev=930243&r1=930242&r2=930243&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/servicedef/services_perm.xml (original)
+++ ofbiz/trunk/applications/accounting/servicedef/services_perm.xml Fri Apr  2 11:22:44 2010
@@ -29,6 +29,12 @@ under the License.
         <implements service="permissionInterface"/>
     </service>
 
+    <service name="acctgBasePermissionCheck" engine="simple"
+            location="component://accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml" invoke="basePermissionCheck">
+        <description>Accounting Basic Permission Checking Logic</description>
+        <implements service="permissionInterface"/>
+    </service>
+
     <service name="acctgBillingAcctCheck" engine="simple"
             location="component://accounting/script/org/ofbiz/accounting/permissions/PermissionServices.xml" invoke="acctgBillingAcctCheck">
         <description>Basic Billing Account Permission Checking Logic</description>

Modified: ofbiz/trunk/applications/accounting/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/LookupScreens.xml?rev=930243&r1=930242&r2=930243&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/LookupScreens.xml Fri Apr  2 11:22:44 2010
@@ -23,7 +23,7 @@ under the License.
     <screen name="LookupPayment">
         <section>
             <condition>
-                <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+                <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
             </condition>
             <actions>
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
@@ -49,7 +49,7 @@ under the License.
     <screen name="LookupInvoice">
         <section>
             <condition>
-                <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+                <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
             </condition>
             <actions>
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
@@ -102,7 +102,7 @@ under the License.
     <screen name="LookupBillingAccount">
         <section>
             <condition>
-                <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+                <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
             </condition>
             <actions>
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
@@ -129,7 +129,7 @@ under the License.
     <screen name="LookupGlAccount">
         <section>
             <condition>
-                <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+                <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
             </condition>
             <actions>
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
@@ -156,7 +156,7 @@ under the License.
     <screen name="LookupAgreement">
         <section>
             <condition>
-                <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+                <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
             </condition>
             <actions>
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
@@ -183,7 +183,7 @@ under the License.
     <screen name="LookupAgreementItem">
         <section>
             <condition>
-                <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+                <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
             </condition>
             <actions>
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
@@ -210,7 +210,7 @@ under the License.
     <screen name="LookupPaymentGroupMember">
         <section>
             <condition>
-                <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+                <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
             </condition>
             <actions>
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
@@ -235,7 +235,7 @@ under the License.
     <screen name="LookupGlReconciliation">
         <section>
             <condition>
-                <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+                <if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
             </condition>
             <actions>
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>