Author: jleroux
Date: Wed Jan 17 12:10:17 2018
New Revision: 1821356
URL: http://svn.apache.org/viewvc?rev=1821356&view=rev
Log:
Improved: Remove ftl dependency in order on ecommerce
(OFBIZ-6946)
Currently there are dependencies in the order component on the ecommerce
component. Order management should work without the ecommerce component.
jleroux: I simply removed the commented out lines, no need for a patch
There are still a lot of other dependencies in the order component on the
ecommerce component...
Thanks: Pierre for report
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml?rev=1821356&r1=1821355&r2=1821356&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
Wed Jan 17 12:10:17 2018
@@ -170,8 +170,6 @@ under the License.
<widgets>
<include-screen name="breadcrumbs"/>
<platform-specific><html><html-template
location="component://order/template/entry/catalog/EditProduct.ftl"/></html></platform-specific>
- <!--<platform-specific><html><html-template
location="component://order/template/product/productdetail.ftl"/></html></platform-specific>-->
- <!-- Warning: this ftl file in the order component is slightly
different from that of the ecommerce one (the edit product link is shown) -->
<platform-specific><html><html-template
location="component://order/template/entry/catalog/ProductDetail.ftl"/></html></platform-specific>
</widgets>
</section>
@@ -182,13 +180,11 @@ under the License.
<set field="productsummaryScreen"
value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#productsummary"/>
<set field="inlineProductDetailScreen"
value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#inlineProductDetail"/>
<script
location="component://order/groovyScripts/entry/catalog/ProductDetail.groovy"/>
- <!--<script
location="component://ecommerce/groovyScripts/catalog/prepareconfigform.bsh"/>-->
<script
location="component://order/groovyScripts/entry/catalog/PrepareConfigForm.groovy"/>
</actions>
<widgets>
<include-screen name="breadcrumbs"/>
<platform-specific><html><html-template
location="component://order/template/entry/catalog/EditProduct.ftl"/></html></platform-specific>
- <!--<platform-specific><html><html-template
location="component://order/template/product/configproductdetail.ftl"/></html></platform-specific>-->
<platform-specific><html><html-template
location="component://order/template/entry/catalog/ConfigProductDetail.ftl"/></html></platform-specific>
</widgets>
</section>
