Author: jleroux
Date: Sat Sep 26 11:52:31 2015
New Revision: 1705417
URL: http://svn.apache.org/viewvc?rev=1705417&view=rev
Log:
I spotted some misses in FTL templates after r1705329, this fixes them
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl
ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl
ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/catalog/Category.groovy
ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/SideDeepCategory.ftl
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl?rev=1705417&r1=1705416&r2=1705417&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/breadcrumbs.ftl
Sat Sep 26 11:52:31 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/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl?rev=1705417&r1=1705416&r2=1705417&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/sidedeepcategory.ftl
Sat Sep 26 11:52:31 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/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl?rev=1705417&r1=1705416&r2=1705417&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl
(original)
+++ ofbiz/trunk/applications/product/webapp/catalog/find/sidedeepcategory.ftl
Sat Sep 26 11:52:31 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy?rev=1705417&r1=1705416&r2=1705417&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy
Sat Sep 26 11:52:31 2015
@@ -55,16 +55,16 @@ List fillTree(rootCat ,CatLvl, parentCat
def rootMap = [:];
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/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl?rev=1705417&r1=1705416&r2=1705417&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/minilastviewedcategories.ftl
Sat Sep 26 11:52:31 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl?rev=1705417&r1=1705416&r2=1705417&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/sidedeepcategory.ftl
Sat Sep 26 11:52:31 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/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/catalog/Category.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/catalog/Category.groovy?rev=1705417&r1=1705416&r2=1705417&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/catalog/Category.groovy
(original)
+++
ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/catalog/Category.groovy
Sat Sep 26 11:52:31 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/trunk/specialpurpose/webpos/webapp/webpos/catalog/SideDeepCategory.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/SideDeepCategory.ftl?rev=1705417&r1=1705416&r2=1705417&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/SideDeepCategory.ftl
(original)
+++
ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/SideDeepCategory.ftl
Sat Sep 26 11:52:31 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>
