svn commit: r1705412 - in /ofbiz/trunk: applications/manufacturing/web
Locked
svn commit: r1705412 - in /ofbiz/trunk: applications/manufacturing/web
 
|
Author: jleroux
Date: Sat Sep 26 11:20:18 2015 New Revision: 1705412 URL: http://svn.apache.org/viewvc?rev=1705412&view=rev Log: I just spotted cases like categoryContentWrapper.DESCRIPTION; before committing r1705405. This fixes them Thanks also for Deepak's report about it, it was obvious when you loaded the ecommerce apps Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/BestProducts.groovy ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy?rev=1705412&r1=1705411&r2=1705412&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy Sat Sep 26 11:20:18 2015 @@ -59,7 +59,7 @@ if (packageContents) { components : []]); } OrderContentWrapper orderContentWrapper = OrderContentWrapper.makeOrderContentWrapper(orderItem, request); - String imageUrl = orderContentWrapper.IMAGE_URL; + String imageUrl = orderContentWrapper.get("IMAGE_URL", "url") packageMap = (Map)packagesMap.packageContent.shipmentPackageSeqId; components = (List)packageMap.components; components.add([product : product, orderItem : orderItem, imageUrl : imageUrl]); Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy?rev=1705412&r1=1705411&r2=1705412&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy Sat Sep 26 11:20:18 2015 @@ -79,12 +79,12 @@ if (category) { } categoryContentWrapper = new CategoryContentWrapper(category, request); - categoryDescription = categoryContentWrapper.DESCRIPTION; + categoryDescription = categoryContentWrapper.get("DESCRIPTION", "html"); if (pageTitle) { context.title = pageTitle.textData; } else { - context.title = categoryContentWrapper.CATEGORY_NAME; + context.title = categoryContentWrapper.get("CATEGORY_NAME", "html"); } if (metaDescription) { Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy?rev=1705412&r1=1705411&r2=1705412&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy Sat Sep 26 11:20:18 2015 @@ -94,27 +94,27 @@ if (productId) { if (pageTitle) { context.title = pageTitle.textData; } else { - context.put("title", contentWrapper.get("PRODUCT_NAME")); + context.put("title", contentWrapper.get("PRODUCT_NAME", "html")); } if (metaDescription) { context.metaDescription = metaDescription.textData; } else { - context.put("metaDescription", contentWrapper.get("DESCRIPTION")); + context.put("metaDescription", contentWrapper.get("DESCRIPTION", "html")); } if (metaKeywords) { context.metaKeywords = metaKeywords.textData; } else { keywords = []; - keywords.add(contentWrapper.get("PRODUCT_NAME")); + keywords.add(contentWrapper.get("PRODUCT_NAME", "html")); keywords.add(catalogName); members = from("ProductCategoryMember").where("productId", productId).cache(true).queryList(); members.each { member -> category = member.getRelatedOne("ProductCategory", true); if (category.description) { categoryContentWrapper = new CategoryContentWrapper(category, request); - categoryDescription = categoryContentWrapper.DESCRIPTION; + categoryDescription = categoryContentWrapper.get("DESCRIPTION", "html")); if (categoryDescription) { keywords.add(categoryDescription); } Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/BestProducts.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/BestProducts.groovy?rev=1705412&r1=1705411&r2=1705412&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/BestProducts.groovy (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/product/BestProducts.groovy Sat Sep 26 11:20:18 2015 @@ -56,7 +56,7 @@ orderHeaderList.each { orderHeader -> orderItemDetail.productId = orderItem.productId; product = from("Product").where("productId", orderItem.productId).queryOne() contentWrapper = new ProductContentWrapper(product, request); - orderItemDetail.productName = contentWrapper.get("PRODUCT_NAME"); + orderItemDetail.productName = contentWrapper.get("PRODUCT_NAME", "html"); orderItemDetail.amount = amount; orderItemDetail.qtyOrdered = qtyOrdered; orderItemDetail.currencyUom = orderHeader.currencyUom; Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy?rev=1705412&r1=1705411&r2=1705412&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy Sat Sep 26 11:20:18 2015 @@ -31,7 +31,7 @@ if(!UtilValidate.isEmpty(parentCategoryS categoryContentWrapper = new CategoryContentWrapper(category, request); pathTemp = pathTemp + path; - cateMap.title = categoryContentWrapper.CATEGORY_NAME; + cateMap.title = categoryContentWrapper.get("DESCRIPTION", "html"); cateMap.productCategoryId = category.productCategoryId; cateMap.parentCategory = pathTemp; @@ -44,6 +44,6 @@ if(!UtilValidate.isEmpty(parentCategoryS } currentCategory = from("ProductCategory").where("productCategoryId", productCategoryId).queryOne(); currentCategoryContentWrapper = new CategoryContentWrapper(currentCategory, request); -context.currentCategoryName = currentCategoryContentWrapper.CATEGORY_NAME; -context.currentCategoryDescription = currentCategoryContentWrapper.DESCRIPTION; +context.currentCategoryName = currentCategoryContentWrapper.get("CATEGORY_NAME", "html"); +context.currentCategoryDescription = currentCategoryContentWrapper.get("DESCRIPTION", "html"); context.currentCategoryId = productCategoryId; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |