Author: mor
Date: Sat May 1 07:04:06 2010
New Revision: 939937
URL: http://svn.apache.org/viewvc?rev=939937&view=rev
Log:
I think it would be a good idea to show Category Name instead of Category
description. The chances are that the former
would be present in most of the cases. This fix an issue with the quick add
feature on order manager where the drop for
quick add categories wasn't showing any thing because the description is not
present on the quick add categories. This
eventually fixes the same issue in the ecommerce because the ecommerce inherits
this feature from order manager.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/QuickAdd.groovy
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/QuickAdd.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/QuickAdd.groovy?rev=939937&r1=939936&r2=939937&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/QuickAdd.groovy
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/QuickAdd.groovy
Sat May 1 07:04:06 2010
@@ -45,4 +45,6 @@ if (categoryId) {
context[key] = value;
}
}
+ productCategory = delegator.findByPrimaryKey("ProductCategory",
["productCategoryId" : categoryId]);
+ context.productCategory = productCategory;
}
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl?rev=939937&r1=939936&r2=939937&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/quickadd.ftl
Sat May 1 07:04:06 2010
@@ -21,17 +21,17 @@ under the License.
<table border='0' cellpadding='3' cellspacing='0'>
<tr>
<td>
- <h2>${productCategory.description?if_exists}</h2>
+ <h2>${productCategory.categoryName?if_exists}</h2>
</td>
<td align="right">
<form name="choosequickaddform" method="post"
action="<@ofbizUrl>quickadd</@ofbizUrl>" style='margin: 0;'>
<select name='category_id'>
- <option
value='${productCategory.productCategoryId}'>${productCategory.description?if_exists}</option>
+ <option
value='${productCategory.productCategoryId}'>${productCategory.categoryName?if_exists}</option>
<option value='${productCategory.productCategoryId}'>--</option>
<#list quickAddCats as quickAddCatalogId>
<#assign loopCategory =
delegator.findByPrimaryKeyCache("ProductCategory",
Static["org.ofbiz.base.util.UtilMisc"].toMap("productCategoryId",
quickAddCatalogId))>
<#if loopCategory?has_content>
- <option
value='${quickAddCatalogId}'>${loopCategory.description?if_exists}</option>
+ <option
value='${quickAddCatalogId}'>${loopCategory.categoryName?if_exists}</option>
</#if>
</#list>
</select>
