Author: hansbak
Date: Fri Jun 22 04:12:11 2012
New Revision: 1352769
URL: http://svn.apache.org/viewvc?rev=1352769&view=rev
Log:
allow ACCOUNTING_ADMIN also to do PAYPROC_ADMIN
Modified:
ofbiz/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml
ofbiz/trunk/applications/accounting/data/AccountingSecurityPermissionSeedData.xml
ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
Modified:
ofbiz/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml?rev=1352769&r1=1352768&r2=1352769&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml
(original)
+++
ofbiz/trunk/applications/accounting/data/AccountingSecurityGroupDemoData.xml
Fri Jun 22 04:12:11 2012
@@ -19,7 +19,6 @@ under the License.
-->
<entity-engine-xml>
<!-- Payment Processors security -->
- <SecurityGroupPermission groupId="FULLADMIN" permissionId="PAYPROC_ADMIN"/>
<SecurityGroupPermission groupId="FLEXADMIN"
permissionId="PAYPROC_CREATE"/>
<SecurityGroupPermission groupId="FLEXADMIN"
permissionId="PAYPROC_DELETE"/>
<SecurityGroupPermission groupId="FLEXADMIN" permissionId="PAYPROC_VIEW"/>
@@ -45,7 +44,6 @@ under the License.
<SecurityGroupPermission groupId="BIZADMIN"
permissionId="ACCOUNTING_ADMIN"/>
<!-- Manual Payment security -->
- <SecurityGroupPermission groupId="FULLADMIN"
permissionId="MANUAL_PAYMENT"/>
<SecurityGroupPermission groupId="FLEXADMIN"
permissionId="MANUAL_PAYMENT"/>
<SecurityGroupPermission groupId="BIZADMIN" permissionId="MANUAL_PAYMENT"/>
Modified:
ofbiz/trunk/applications/accounting/data/AccountingSecurityPermissionSeedData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/AccountingSecurityPermissionSeedData.xml?rev=1352769&r1=1352768&r2=1352769&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/data/AccountingSecurityPermissionSeedData.xml
(original)
+++
ofbiz/trunk/applications/accounting/data/AccountingSecurityPermissionSeedData.xml
Fri Jun 22 04:12:11 2012
@@ -68,7 +68,6 @@ under the License.
<!-- add admin to SUPER permission group -->
<SecurityGroupPermission groupId="SUPER" permissionId="ACCOUNTING_ADMIN"/>
- <SecurityGroupPermission groupId="SUPER" permissionId="PAYPROC_ADMIN"/>
<SecurityGroupPermission groupId="SUPER" permissionId="PAY_INFO_ADMIN"/>
<SecurityGroupPermission groupId="SUPER"
permissionId="ACCOUNTING_COMM_VIEW"/>
<SecurityGroupPermission groupId="SUPER"
permissionId="ACCOUNTING_PRINT_CHECKS"/>
Modified: ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml?rev=1352769&r1=1352768&r2=1352769&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml Fri Jun 22
04:12:11 2012
@@ -36,7 +36,10 @@ under the License.
</menu-item>
<menu-item name="PaymentGatewayConfig"
title="${uiLabelMap.AccountingPaymentGatewayConfig}">
<condition>
- <if-has-permission permission="PAYPROC" action="_ADMIN"/>
+ <or>
+ <if-has-permission permission="PAYPROC" action="_ADMIN"/>
+ <if-has-permission permission="ACCOUNTING"
action="_ADMIN"/>
+ </or>
</condition>
<link target="FindPaymentGatewayConfig"/>
</menu-item>
