Author: jleroux
Date: Sat Sep 26 11:52:57 2015
New Revision: 1705418
URL: http://svn.apache.org/viewvc?rev=1705418&view=rev
Log:
"Applied fix from trunk for revision: 1705417"
------------------------------------------------------------------------
r1705417 | jleroux | 2015-09-26 13:52:31 +0200 (sam. 26 sept. 2015) | 3 lignes
I spotted some misses in FTL templates after r1705329, this fixes them
------------------------------------------------------------------------
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl
ofbiz/branches/release14.12/applications/product/webapp/catalog/find/sidedeepcategory.ftl
ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy
ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl
ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl
ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/catalog/Category.groovy
ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/catalog/SideDeepCategory.ftl
Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 26 11:52:57 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,1705412
+/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,1705417
Modified:
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl?rev=1705418&r1=1705417&r2=1705418&view=diff
==============================================================================
---
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl
(original)
+++
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl
Sat Sep 26 11:52:57 2015
@@ -33,10 +33,10 @@ under the License.
<#if !isDefaultTheme>
<li>
<a href="<@ofbizCatalogUrl currentCategoryId=crumb
previousCategoryId=previousCategoryId!""/>" class="<#if
crumb_has_next>linktext<#else>buttontextdisabled</#if>">
- <#if catContentWrappers[crumb].get("CATEGORY_NAME")??>
- ${catContentWrappers[crumb].get("CATEGORY_NAME")}
- <#elseif catContentWrappers[crumb].get("DESCRIPTION")??>
- ${catContentWrappers[crumb].get("DESCRIPTION")}
+ <#if catContentWrappers[crumb].get("CATEGORY_NAME",
"html")??>
+ ${catContentWrappers[crumb].get("CATEGORY_NAME", "html")}
+ <#elseif catContentWrappers[crumb].get("DESCRIPTION",
"html")??>
+ ${catContentWrappers[crumb].get("DESCRIPTION", "html")}
<#else>
${crumb}
</#if>
@@ -44,10 +44,10 @@ under the License.
</li>
<#else>
<a href="<@ofbizCatalogUrl currentCategoryId=crumb
previousCategoryId=previousCategoryId!""/>" class="<#if
crumb_has_next>linktext<#else>buttontextdisabled</#if>">
- <#if catContentWrappers[crumb].get("CATEGORY_NAME")??>
- ${catContentWrappers[crumb].get("CATEGORY_NAME")}
- <#elseif catContentWrappers[crumb].get("DESCRIPTION")??>
- ${catContentWrappers[crumb].get("DESCRIPTION")}
+ <#if catContentWrappers[crumb].get("CATEGORY_NAME", "html")??>
+ ${catContentWrappers[crumb].get("CATEGORY_NAME", "html")}
+ <#elseif catContentWrappers[crumb].get("DESCRIPTION",
"html")??>
+ ${catContentWrappers[crumb].get("DESCRIPTION", "html")}
<#else>
${crumb}
</#if>
Modified:
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl?rev=1705418&r1=1705417&r2=1705418&view=diff
==============================================================================
---
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl
(original)
+++
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl
Sat Sep 26 11:52:57 2015
@@ -28,17 +28,17 @@ under the License.
</#if-->
<#if curCategoryId?? && curCategoryId == category.productCategoryId>
<div class="browsecategorytext">
- <#if catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content>
+ <#if catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME",
"html")?has_content>
<#if sessionAttributes.shoppingCart?? &&
sessionAttributes.shoppingCart.isPurchaseOrder()>
- <a
href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId!}/~category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
+ <a
href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId!}/~category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME",
"html")}</a>
<#else>
- <a
href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
+ <a
href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME",
"html")}</a>
</#if>
- <#elseif catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content>
+ <#elseif catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION",
"html")?has_content>
<#if sessionAttributes.shoppingCart?? &&
sessionAttributes.shoppingCart.isPurchaseOrder()>
- <a
href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId!}/~category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
+ <a
href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId!}/~category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION",
"html")}</a>
<#else>
- <a
href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
+ <a
href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION",
"html")}</a>
</#if>
<#else>
<#if sessionAttributes.shoppingCart?? &&
sessionAttributes.shoppingCart.isPurchaseOrder()>
@@ -50,17 +50,17 @@ under the License.
</div>
<#else>
<div class="browsecategorytext">
- <#if
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content>
+ <#if catContentWrappers[category.productCategoryId].get("CATEGORY_NAME",
"html")?has_content>
<#if sessionAttributes.shoppingCart?? &&
sessionAttributes.shoppingCart.isPurchaseOrder()>
- <a
href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId!}/~category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
+ <a
href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId!}/~category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME",
"html")}</a>
<#else>
- <a
href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
+ <a
href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME",
"html")}</a>
</#if>
- <#elseif
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content>
+ <#elseif
catContentWrappers[category.productCategoryId].get("DESCRIPTION",
"html")?has_content>
<#if sessionAttributes.shoppingCart?? &&
sessionAttributes.shoppingCart.isPurchaseOrder()>
- <a
href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId!}/~category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
+ <a
href="<@ofbizUrl>keywordsearch/~SEARCH_CATEGORY_ID=${category.productCategoryId}/~SEARCH_SUPPLIER_ID=${sessionAttributes.shoppingCart.partyId!}/~category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION",
"html")}</a>
<#else>
- <a
href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
+ <a
href="<@ofbizUrl>category?category_id=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION",
"html")}</a>
</#if>
<#else>
<#if sessionAttributes.shoppingCart?? &&
sessionAttributes.shoppingCart.isPurchaseOrder()>
Modified:
ofbiz/branches/release14.12/applications/product/webapp/catalog/find/sidedeepcategory.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/webapp/catalog/find/sidedeepcategory.ftl?rev=1705418&r1=1705417&r2=1705418&view=diff
==============================================================================
---
ofbiz/branches/release14.12/applications/product/webapp/catalog/find/sidedeepcategory.ftl
(original)
+++
ofbiz/branches/release14.12/applications/product/webapp/catalog/find/sidedeepcategory.ftl
Sat Sep 26 11:52:57 2015
@@ -24,20 +24,20 @@ under the License.
</#if>
<#if curCategoryId?? && curCategoryId == category.productCategoryId>
<div class="browsecategorytext">
- <#if catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content>
- <a
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}
[${category.productCategoryId}]</a>
- <#elseif catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content>
- <a
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}
[${category.productCategoryId}]</a>
+ <#if catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME",
"html")?has_content>
+ <a
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME",
"html")} [${category.productCategoryId}]</a>
+ <#elseif catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION",
"html")?has_content>
+ <a
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION",
"html")} [${category.productCategoryId}]</a>
<#else>
<a
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybuttondisabled">${category.categoryName?default(category.description)!}
[${category.productCategoryId}]</a>
</#if>
</div>
<#else>
<div class="browsecategorytext">
- <#if catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content>
- <a
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}
[${category.productCategoryId}]</a>
- <#elseif catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content>
- <a
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}
[${category.productCategoryId}]</a>
+ <#if catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME",
"html")?has_content>
+ <a
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME",
"html")} [${category.productCategoryId}]</a>
+ <#elseif catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION",
"html")?has_content>
+ <a
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION",
"html")} [${category.productCategoryId}]</a>
<#else>
<a
href="<@ofbizUrl>EditCategory?productCategoryId=${category.productCategoryId}${pStr!}</@ofbizUrl>"
class="browsecategorybutton">${category.categoryName?default(category.description)!}
[${category.productCategoryId}]</a>
</#if>
Modified:
ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy?rev=1705418&r1=1705417&r2=1705418&view=diff
==============================================================================
---
ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy
(original)
+++
ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy
Sat Sep 26 11:52:57 2015
@@ -58,16 +58,16 @@ List fillTree(rootCat ,CatLvl, parentCat
def rootMap = FastMap.newInstance();
category = from("ProductCategory").where("productCategoryId",
root.productCategoryId).queryOne();
categoryContentWrapper = new CategoryContentWrapper(category,
request);
- context.title = categoryContentWrapper.CATEGORY_NAME;
- categoryDescription = categoryContentWrapper.DESCRIPTION;
+ context.title = categoryContentWrapper.get("CATEGORY_NAME",
"html");
+ categoryDescription =
categoryContentWrapper.get("DESCRIPTION", "html");
if(categoryContentWrapper.CATEGORY_NAME)
- rootMap["categoryName"] =
categoryContentWrapper.CATEGORY_NAME;
+ rootMap["categoryName"] =
categoryContentWrapper.get("CATEGORY_NAME", "html");
else
rootMap["categoryName"] = root.categoryName;
if(categoryContentWrapper.DESCRIPTION)
- rootMap["categoryDescription"] =
categoryContentWrapper.DESCRIPTION;
+ rootMap["categoryDescription"] =
categoryContentWrapper.get("DESCRIPTION", "html");
else
rootMap["categoryDescription"] = root.description;
Modified:
ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl?rev=1705418&r1=1705417&r2=1705418&view=diff
==============================================================================
---
ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl
(original)
+++
ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl
Sat Sep 26 11:52:57 2015
@@ -35,10 +35,10 @@ under the License.
<#assign category = delegator.findOne("ProductCategory",
Static["org.ofbiz.base.util.UtilMisc"].toMap("productCategoryId", categoryId),
true)!>
<#if category?has_content>
<li class="browsecategorytext">
- <#if catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")??>
- <a href="<@ofbizCatalogAltUrl productCategoryId=categoryId/>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")}</a>
- <#elseif catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION")??>
- <a href="<@ofbizCatalogAltUrl productCategoryId=categoryId/>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")}</a>
+ <#if catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME", "html")??>
+ <a href="<@ofbizCatalogAltUrl productCategoryId=categoryId/>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME",
"html")}</a>
+ <#elseif catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION", "html")??>
+ <a href="<@ofbizCatalogAltUrl productCategoryId=categoryId/>"
class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION",
"html")}</a>
<#else>
<a href="<@ofbizCatalogAltUrl productCategoryId=categoryId/>"
class="browsecategorybutton">${category.description!}</a>
</#if>
Modified:
ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl?rev=1705418&r1=1705417&r2=1705418&view=diff
==============================================================================
---
ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl
(original)
+++
ofbiz/branches/release14.12/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl
Sat Sep 26 11:52:57 2015
@@ -22,13 +22,13 @@ under the License.
<#-- looping macro -->
<#macro categoryList parentCategory category wrapInBox>
- <#if catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")??>
- <#assign categoryName =
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")>
+ <#if catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME", "html")??>
+ <#assign categoryName =
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME", "html")>
<#else>
<#assign categoryName = category.categoryName!>
</#if>
- <#if catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION")??>
- <#assign categoryDescription =
catContentWrappers[category.productCategoryId].get("DESCRIPTION")>
+ <#if catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION", "html")??>
+ <#assign categoryDescription =
catContentWrappers[category.productCategoryId].get("DESCRIPTION", "html")>
<#else>
<#assign categoryDescription = category.description!>
</#if>
Modified:
ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/catalog/Category.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/catalog/Category.groovy?rev=1705418&r1=1705417&r2=1705418&view=diff
==============================================================================
---
ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/catalog/Category.groovy
(original)
+++
ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/catalog/Category.groovy
Sat Sep 26 11:52:57 2015
@@ -42,8 +42,8 @@ if (category) {
detailScreen = category.detailScreen;
}
categoryContentWrapper = new CategoryContentWrapper(category, request);
- context.title = categoryContentWrapper.CATEGORY_NAME;
- categoryDescription = categoryContentWrapper.DESCRIPTION;
+ context.title = categoryContentWrapper.get("CATEGORY_NAME", "html");
+ categoryDescription = categoryContentWrapper.get("DESCRIPTION", "html");
if (categoryDescription) {
context.metaDescription = categoryDescription;
context.metaKeywords = categoryDescription + ", " + catalogName;
Modified:
ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/catalog/SideDeepCategory.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/catalog/SideDeepCategory.ftl?rev=1705418&r1=1705417&r2=1705418&view=diff
==============================================================================
---
ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/catalog/SideDeepCategory.ftl
(original)
+++
ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/catalog/SideDeepCategory.ftl
Sat Sep 26 11:52:57 2015
@@ -22,13 +22,13 @@ under the License.
<#-- looping macro -->
<#macro categoryList parentCategory category wrapInBox>
- <#if catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")??>
- <#assign categoryName =
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")>
+ <#if catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME", "html")??>
+ <#assign categoryName =
catContentWrappers[category.productCategoryId].get("CATEGORY_NAME", "html")>
<#else>
<#assign categoryName = category.categoryName!>
</#if>
- <#if catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION")??>
- <#assign categoryDescription =
catContentWrappers[category.productCategoryId].get("DESCRIPTION")>
+ <#if catContentWrappers?? &&
catContentWrappers[category.productCategoryId]?? &&
catContentWrappers[category.productCategoryId].get("DESCRIPTION", "html")??>
+ <#assign categoryDescription =
catContentWrappers[category.productCategoryId].get("DESCRIPTION", "html")>
<#else>
<#assign categoryDescription = category.description!>
</#if>
@@ -79,4 +79,4 @@ under the License.
</ol>
</div>
</div>
-</#if>
\ No newline at end of file
+</#if>
