This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2d49b0c Improved: 'VIEW' permissions - Accounting InvoiceRoles
(OFBIZ-12413) (#359)
2d49b0c is described below
commit 2d49b0cf6309f88595e80cd1433a8360a6fbbedd
Author: Pierre Smits <[email protected]>
AuthorDate: Sat Nov 27 13:14:53 2021 +0100
Improved: 'VIEW' permissions - Accounting InvoiceRoles (OFBIZ-12413) (#359)
Modified: InvoiceScreens.xml
Introduced
restructured screen InvoiceRoles, to show appropriate content based on the
permissions of the user
---
applications/accounting/widget/InvoiceScreens.xml | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/applications/accounting/widget/InvoiceScreens.xml
b/applications/accounting/widget/InvoiceScreens.xml
index 78f5d1b..8479bec 100644
--- a/applications/accounting/widget/InvoiceScreens.xml
+++ b/applications/accounting/widget/InvoiceScreens.xml
@@ -524,10 +524,25 @@ under the License.
<widgets>
<decorator-screen name="CommonInvoiceDecorator"
location="${parameters.invoiceDecoratorLocation}">
<decorator-section name="body">
- <screenlet id="PartyInvoiceRolePanel"
title="${uiLabelMap.AccountingPartyRoleAdd}" collapsible="true">
- <include-form name="EditInvoiceRole"
location="component://accounting/widget/InvoiceForms.xml"/>
- </screenlet>
- <include-form name="ListInvoiceRoles"
location="component://accounting/widget/InvoiceForms.xml"/>
+ <section>
+ <condition>
+ <and>
+ <or>
+ <if-has-permission
permission="ACCOUNTING" action="_CREATE"/>
+ <if-has-permission
permission="ACCOUNTING" action="_UPDATE"/>
+ </or>
+ </and>
+ </condition>
+ <widgets>
+ <screenlet id="PartyInvoiceRolePanel"
title="${uiLabelMap.AccountingPartyRoleAdd}" collapsible="true">
+ <include-form name="EditInvoiceRole"
location="component://accounting/widget/InvoiceForms.xml"/>
+ </screenlet>
+ <include-form name="ListInvoiceRoles"
location="component://accounting/widget/InvoiceForms.xml"/>
+ </widgets>
+ <fail-widgets>
+ <include-form name="InvoiceRoles"
location="component://accounting/widget/InvoiceForms.xml"/>
+ </fail-widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
