You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2015/09/26 13:20:47 UTC
svn commit: r1705413 - in /ofbiz/branches/release14.12: ./
applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/
applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/
applications/product/webapp/catalog/WEB-INF/actions/pr...
Author: jleroux
Date: Sat Sep 26 11:20:47 2015
New Revision: 1705413
URL: http://svn.apache.org/viewvc?rev=1705413&view=rev
Log:
"Applied fix from trunk for revision: 1705412"
------------------------------------------------------------------------
r1705412 | jleroux | 2015-09-26 13:20:18 +0200 (sam. 26 sept. 2015) | 6 lignes
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/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy
ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/product/BestProducts.groovy
ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy
Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 26 11:20:47 2015
@@ -8,4 +8,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412
Modified: ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy?rev=1705413&r1=1705412&r2=1705413&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy (original)
+++ ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy Sat Sep 26 11:20:47 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/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy?rev=1705413&r1=1705412&r2=1705413&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy (original)
+++ ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy Sat Sep 26 11:20:47 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/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy?rev=1705413&r1=1705412&r2=1705413&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy (original)
+++ ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy Sat Sep 26 11:20:47 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/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/product/BestProducts.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/product/BestProducts.groovy?rev=1705413&r1=1705412&r2=1705413&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/product/BestProducts.groovy (original)
+++ ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/product/BestProducts.groovy Sat Sep 26 11:20:47 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/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy?rev=1705413&r1=1705412&r2=1705413&view=diff
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy (original)
+++ ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy Sat Sep 26 11:20:47 2015
@@ -33,7 +33,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;
@@ -46,6 +46,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;