Author: mor
Date: Wed May 19 10:04:17 2010
New Revision: 946100
URL: http://svn.apache.org/viewvc?rev=946100&view=rev
Log:
Removed an unnecessary decorator screen CommonQuotePriceDecorator related to
Order Manager Quotes. The only difference between this and screen
CommonQuoteDecorator is that the the former has a permission check for
ORDERMGR__QUOTE_PRICE where as latter has a check for permission
ORDERMGR_VIEW. The permission ORDERMGR_QUOTE_PRICE is though already checked at
menu level and hence is not required explicity
at the decorator level.
Modified:
ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
Modified: ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml?rev=946100&r1=946099&r2=946100&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml Wed May 19
10:04:17 2010
@@ -140,41 +140,6 @@ under the License.
</section>
</screen>
- <screen name="CommonQuotePriceDecorator">
- <section>
- <widgets>
- <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <section>
- <!-- do check for ORDERMGR, _QUOTE_PRICE
permission -->
- <condition>
- <if-has-permission permission="ORDERMGR"
action="_QUOTE_PRICE"/>
- </condition>
- <widgets>
- <section>
- <condition>
- <not><if-empty field="quote"/></not>
- </condition>
- <widgets>
- <include-menu name="QuoteTabBar"
location="component://order/widget/ordermgr/OrderMenus.xml"/>
- </widgets>
- </section>
- <container>
- <label
style="h1">[${uiLabelMap.CommonId}:${quote.quoteId}]
${quote.description}</label>
- </container>
-
- <decorator-section-include name="body"/>
-
- </widgets>
- <fail-widgets>
- <label
style="h3">${uiLabelMap.OrderQuotePricePermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="CommonPopUpDecorator">
<section>
<actions>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?rev=946100&r1=946099&r2=946100&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Wed May 19
10:04:17 2010
@@ -393,7 +393,7 @@ under the License.
</entity-and>
</actions>
<widgets>
- <decorator-screen name="CommonQuotePriceDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonQuoteDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.OrderOrderQuoteListCoefficients}">
<container>
@@ -422,7 +422,7 @@ under the License.
<entity-one entity-name="QuoteCoefficient"
value-field="quoteCoefficient"/>
</actions>
<widgets>
- <decorator-screen name="CommonQuotePriceDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonQuoteDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.OrderOrderQuoteEditCoefficients}">
<container>
@@ -461,7 +461,7 @@ under the License.
<script
location="component://order/webapp/ordermgr/WEB-INF/actions/quote/ManageQuotePrices.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonQuotePriceDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonQuoteDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.OrderOrderQuotePrices}">
<platform-specific>
@@ -495,7 +495,7 @@ under the License.
</entity-and>
</actions>
<widgets>
- <decorator-screen name="CommonQuotePriceDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonQuoteDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.OrderOrderQuoteListAdjustments}">
<container>
@@ -527,7 +527,7 @@ under the License.
<entity-one entity-name="QuoteAdjustment"
value-field="quoteAdjustment"/>
</actions>
<widgets>
- <decorator-screen name="CommonQuotePriceDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonQuoteDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.OrderOrderQuoteEditAdjustments}">
<container>
@@ -566,7 +566,7 @@ under the License.
<script
location="component://order/webapp/ordermgr/WEB-INF/actions/quote/ViewQuoteProfit.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonQuotePriceDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonQuoteDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet
title="${uiLabelMap.OrderOrderQuoteViewProfit}">
<platform-specific>
