You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ap...@apache.org on 2009/10/07 07:08:44 UTC
svn commit: r822588 - in /ofbiz/trunk/applications/accounting/widget:
CommonScreens.xml PaymentScreens.xml
Author: apatel
Date: Wed Oct 7 05:08:43 2009
New Revision: 822588
URL: http://svn.apache.org/viewvc?rev=822588&view=rev
Log:
Moved CommonPaymentDecorator to PaymentScreens file. Updated decorator location parameter name to paymentDecoratorLocation. This pattern is adopted from InvoiceScreens. This pattern allows to easily override decorator by specifying custom value to paymentDecoratorLocation parameter.
Modified:
ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=822588&r1=822587&r2=822588&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Wed Oct 7 05:08:43 2009
@@ -49,37 +49,6 @@
</section>
</screen>
- <screen name="CommonPaymentDecorator">
- <section>
- <actions>
- <set field="headerItem" value="payments"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <!-- do check for ACCOUNTING, _VIEW permission -->
- <condition>
- <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
- </condition>
- <widgets>
- <include-menu name="PaymentTabBar" location="component://accounting/widget/Menus.xml"/>
- <include-menu name="PaymentSubTabBar" location="component://accounting/widget/Menus.xml"/>
- <container style="leftclear">
- <label style="h1" text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonId}:[${paymentId}] ${${extraFunctionName}}"/>
- </container>
- <decorator-section-include name="body"/>
- </widgets>
- <fail-widgets>
- <label style="h3" text="${uiLabelMap.AccountingViewPermissionError}"/>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
<screen name="CommonPaymentGroupDecorator">
<section>
<actions>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=822588&r1=822587&r2=822588&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Wed Oct 7 05:08:43 2009
@@ -20,6 +20,37 @@
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+
+ <screen name="CommonPaymentDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="payments"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <!-- do check for ACCOUNTING, _VIEW permission -->
+ <condition>
+ <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <include-menu name="PaymentTabBar" location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="PaymentSubTabBar" location="component://accounting/widget/Menus.xml"/>
+ <container style="leftclear">
+ <label style="h1" text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonId}:[${paymentId}] ${${extraFunctionName}}"/>
+ </container>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="h3" text="${uiLabelMap.AccountingViewPermissionError}"/>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
<screen name="FindPayments">
<section>
<actions>
@@ -113,7 +144,7 @@
</entity-one>
</actions>
<widgets>
- <decorator-screen name="CommonPaymentDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonPaymentDecorator" location="${parameters.paymentDecoratorLocation}">
<decorator-section name="body">
<section>
<widgets>
@@ -194,7 +225,7 @@
</entity-condition>
</actions>
<widgets>
- <decorator-screen name="CommonPaymentDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonPaymentDecorator" location="${parameters.paymentDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
@@ -336,7 +367,7 @@
</entity-condition>
</actions>
<widgets>
- <decorator-screen name="CommonPaymentDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonPaymentDecorator" location="${parameters.paymentDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>