Author: jacopoc
Date: Fri Feb 5 12:04:34 2010
New Revision: 906910
URL: http://svn.apache.org/viewvc?rev=906910&view=rev
Log:
Updated code to work properly after recent refactoring of
FlexibleStringExpander; thanks to Abdullah Shaikh for the patch OFBIZ-3443
Modified:
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy
Modified:
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy?rev=906910&r1=906909&r2=906910&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy
(original)
+++
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy
Fri Feb 5 12:04:34 2010
@@ -42,7 +42,7 @@
context.imageServerPath = imageServerPath;
context.imageUrlPrefix = imageUrlPrefix;
-filenameExpander = new FlexibleStringExpander(imageFilenameFormat);
+filenameExpander = FlexibleStringExpander.getInstance(imageFilenameFormat);
context.imageNameCategory = imageUrlPrefix + "/" +
filenameExpander.expandString([location : "categories", type : "category", id :
productCategoryId]);
context.imageNameLinkOne = imageUrlPrefix + "/" +
filenameExpander.expandString([location : "categories", type : "linkOne", id :
productCategoryId]);
context.imageNameLinkTwo = imageUrlPrefix + "/" +
filenameExpander.expandString([location : "categories", type : "linkTwo", id :
productCategoryId]);
Modified:
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy?rev=906910&r1=906909&r2=906910&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy
(original)
+++
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy
Fri Feb 5 12:04:34 2010
@@ -30,7 +30,7 @@
context.imageServerPath = imageServerPath;
context.imageUrlPrefix = imageUrlPrefix;
-filenameExpander = new FlexibleStringExpander(imageFilenameFormat);
+filenameExpander = FlexibleStringExpander.getInstance(imageFilenameFormat);
context.imageNameSmall = imageUrlPrefix + "/" +
filenameExpander.expandString([size : 'small', configItemId : configItemId]);
// Start ProdConfItemContent stuff
