You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2011/06/02 11:06:30 UTC
svn commit: r1130442 - in /ofbiz/trunk/applications/product:
src/org/ofbiz/product/category/CategoryServices.java
webapp/catalog/category/CategoryTree.ftl
Author: hansbak
Date: Thu Jun 2 09:06:30 2011
New Revision: 1130442
URL: http://svn.apache.org/viewvc?rev=1130442&view=rev
Log:
correction on commit 1130415, category detail did not display properly
Modified:
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java
ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTree.ftl
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java?rev=1130442&r1=1130441&r2=1130442&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java Thu Jun 2 09:06:30 2011
@@ -476,7 +476,12 @@ public class CategoryServices {
dataMap.put("title", catId);
}
dataAttrMap.put("onClick", onclickFunction + "('" + catId + additionParam + "')");
- dataAttrMap.put("href",hrefString+catId+hrefString2);
+
+ String hrefStr = hrefString + catId;
+ if (UtilValidate.isNotEmpty(hrefString2)) {
+ hrefStr = hrefStr + hrefString2;
+ }
+ dataAttrMap.put("href", hrefStr);
dataMap.put("attr", dataAttrMap);
josonMap.put("data", dataMap);
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTree.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTree.ftl?rev=1130442&r1=1130441&r2=1130442&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTree.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTree.ftl Thu Jun 2 09:06:30 2011
@@ -95,14 +95,18 @@ var rawdata = [
function callDocument(id,type) {
//jQuerry Ajax Request
- if(type == "catalog")
+ var dataSet = {};
+ if(type == "catalog") {
URL = 'EditProdCatalogAjax';
- else
+ dataSet = {"prodCatalogId" : id, "ajaxUpdateEvent" : "Y"};
+ } else {
URL = 'EditCategoryAjax';
+ dataSet = {"productCategoryId" : id, "ajaxUpdateEvent" : "Y"};
+ }
jQuery.ajax({
url: URL,
type: 'POST',
- data: {"prodCatalogId" : id, "ajaxUpdateEvent" : "Y"},
+ data: dataSet,
error: function(msg) {
alert("An error occured loading content! : " + msg);
},