You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mo...@apache.org on 2010/05/19 12:04:18 UTC
svn commit: r946100 - in /ofbiz/trunk/applications/order/widget/ordermgr:
CommonScreens.xml QuoteScreens.xml
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>
Re: svn commit: r946100 - in /ofbiz/trunk/applications/order/widget/ordermgr: CommonScreens.xml QuoteScreens.xml
Posted by Vikas Mayur <vi...@hotwaxmedia.com>.
Hi Anil,
I was a bit unsure but based on your suggestion I have migrated all of
the code to 10.04 branch.
Regards
Vikas
On May 19, 2010, at 10:31 PM, Anil Patel wrote:
> I think this commit and r946105, 946108 should be applied to 10.04
> as well.
> These commits have no functional changes. They fix permission check
> and decorator screen location issues.
>
> Thanks and Regards
> Anil Patel
> HotWax Media Inc
> Find us on the web at www.hotwaxmedia.com or Google Keyword "ofbiz"
>
> On May 19, 2010, at 6:04 AM, mor@apache.org wrote:
>
>> 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
>
Re: svn commit: r946100 - in /ofbiz/trunk/applications/order/widget/ordermgr: CommonScreens.xml QuoteScreens.xml
Posted by Anil Patel <an...@hotwaxmedia.com>.
I think this commit and r946105, 946108 should be applied to 10.04 as well.
These commits have no functional changes. They fix permission check and decorator screen location issues.
Thanks and Regards
Anil Patel
HotWax Media Inc
Find us on the web at www.hotwaxmedia.com or Google Keyword "ofbiz"
On May 19, 2010, at 6:04 AM, mor@apache.org wrote:
> 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