Author: rishi
Date: Sat Mar 30 13:39:07 2019
New Revision: 1856627
URL: http://svn.apache.org/viewvc?rev=1856627&view=rev
Log:
[Fixed] Incorrect decorator being used over view all promotions and view
promotion details screen causing back navigation. Change the decorator name on
the showAllPromotions and showPromotionDetails screens. Now user can go back
after navigating to both screens.
(OFBIZ-10859)
Thanks to Ratnesh Upadhyay for your contribution
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml?rev=1856627&r1=1856626&r2=1856627&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
Sat Mar 30 13:39:07 2019
@@ -121,7 +121,7 @@ under the License.
<script
location="component://order/groovyScripts/entry/ShowPromoText.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonOrderEntryDecorator"
location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml">
+ <decorator-screen name="CommonOrderCatalogDecorator"
location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml">
<decorator-section name="body">
<platform-specific><html><html-template
location="component://order/template/entry/cart/ShowAllPromotions.ftl"/></html></platform-specific>
</decorator-section>
@@ -137,7 +137,7 @@ under the License.
<script
location="component://order/groovyScripts/entry/cart/ShowPromotionDetails.groovy"/>
</actions>
<widgets>
- <decorator-screen name="CommonOrderEntryDecorator"
location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml">
+ <decorator-screen name="CommonOrderCatalogDecorator"
location="component://order/widget/ordermgr/OrderEntryCommonScreens.xml">
<decorator-section name="body">
<include-screen name="promotion"/>
</decorator-section>
