Author: hansbak
Date: Thu Apr 19 07:49:30 2012
New Revision: 1327853
URL: http://svn.apache.org/viewvc?rev=1327853&view=rev
Log:
productsummary screen is used both in order and ecommerce. Alternative urls
should only be used in the ecommerce, not in the order component
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl?rev=1327853&r1=1327852&r2=1327853&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productsummary.ftl
Thu Apr 19 07:49:30 2012
@@ -53,7 +53,11 @@ ${virtualJavaScript?if_exists}
</script>
<#if product?exists>
<#-- variable setup -->
- <#assign productUrl><@ofbizCatalogAltUrl productId=product.productId
productCategoryId=categoryId/></#assign>
+ <#if backendPath?default("N") == "Y">
+ <#assign productUrl><@ofbizCatalogUrl productId=product.productId
productCategoryId=categoryId/></#assign>
+ <#else>
+ <#assign productUrl><@ofbizCatalogAltUrl productId=product.productId
productCategoryId=categoryId/></#assign>
+ </#if>
<#if requestAttributes.productCategoryMember?exists>
<#assign prodCatMem = requestAttributes.productCategoryMember>
Modified:
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml?rev=1327853&r1=1327852&r2=1327853&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
(original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml
Thu Apr 19 07:49:30 2012
@@ -57,6 +57,7 @@ under the License.
<section>
<actions>
<set field="showPriceDetails" value="Y"/>
+ <set field="backendPath" value="Y"/>
<script
location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy"/>
</actions>
<widgets>
