svn commit: r1705405 - in /ofbiz/trunk: applications/order/webapp/ordermgr/entry/catalog/ applications/product/webapp/catalog/category/ specialpurpose/ecommerce/webapp/ecommerce/catalog/

jleroux Sat, 26 Sep 2015 03:24:51 -0700

Author: jleroux
Date: Sat Sep 26 10:24:02 2015
New Revision: 1705405

URL: http://svn.apache.org/viewvc?rev=1705405&view=rev
Log:
I missed some cases, if ever you spot some others or typos please let me know


Modified:
    
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
    
ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl
    
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl
    
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl
    
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl

Modified: 
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?rev=1705405&r1=1705404&r2=1705405&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl 
(original)
+++ 
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl 
Sat Sep 26 10:24:02 2015
@@ -68,8 +68,8 @@ under the License.
 
 
 <#if productCategory??>
-    <#assign categoryName = categoryContentWrapper.get("CATEGORY_NAME")!/>
-    <#assign categoryDescription = categoryContentWrapper.get("DESCRIPTION")!/>
+    <#assign categoryName = categoryContentWrapper.get("CATEGORY_NAME", 
"html")!/>
+    <#assign categoryDescription = categoryContentWrapper.get("DESCRIPTION", 
"html")!/>
     <#if categoryName?has_content>
         <h1>${categoryName}</h1>
     </#if>
@@ -90,7 +90,7 @@ under the License.
     <#if searchInCategory?default("Y") == "Y">
         <a 
href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${productCategory.productCategoryId}</@ofbizUrl>"
 class="buttontext">${uiLabelMap.ProductSearchInCategory}</a>
     </#if>
-    <#assign longDescription = 
categoryContentWrapper.get("LONG_DESCRIPTION")!/>
+    <#assign longDescription = categoryContentWrapper.get("LONG_DESCRIPTION", 
"html")!/>
     <#assign categoryImageUrl = 
categoryContentWrapper.get("CATEGORY_IMAGE_URL", "url")!/>
     <#if categoryImageUrl?string?has_content || longDescription?has_content>
       <div>

Modified: 
ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl?rev=1705405&r1=1705404&r2=1705405&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl 
(original)
+++ 
ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl 
Sat Sep 26 10:24:02 2015
@@ -58,7 +58,7 @@ under the License.
                                 <a 
href="<@ofbizUrl>EditCategory?productCategoryId=${curCategory.productCategoryId}</@ofbizUrl>"
 >
                                     <#assign catContentWrapper = 
Static["org.ofbiz.product.category.CategoryContentWrapper"].makeCategoryContentWrapper(curCategory,
 request)!>
                                     <#if catContentWrapper?has_content>
-                                        
${catContentWrapper.get("CATEGORY_NAME")!catContentWrapper.get("DESCRIPTION")!curCategory.categoryName!curCategory.description!}
+                                        
${catContentWrapper.get("CATEGORY_NAME", 
"html")!catContentWrapper.get("DESCRIPTION", 
"html")!curCategory.categoryName!curCategory.description!}
                                     <#else>
                                         
${curCategory.categoryName!curCategory.description!}
                                     </#if>
@@ -166,7 +166,7 @@ under the License.
                                     <a 
href="<@ofbizUrl>EditCategory?productCategoryId=${curCategory.productCategoryId}</@ofbizUrl>"
 >
                                         <#assign catContentWrapper = 
Static["org.ofbiz.product.category.CategoryContentWrapper"].makeCategoryContentWrapper(curCategory,
 request)!>
                                         <#if catContentWrapper?has_content>
-                                            
${catContentWrapper.get("CATEGORY_NAME")!catContentWrapper.get("DESCRIPTION")!curCategory.categoryName!curCategory.description!}
+                                            
${catContentWrapper.get("CATEGORY_NAME", 
"html")!catContentWrapper.get("DESCRIPTION", 
"html")!curCategory.categoryName!curCategory.description!}
                                         <#else>
                                             
${curCategory.categoryName!curCategory.description!}
                                         </#if>
@@ -231,4 +231,4 @@ under the License.
         </table>
     </div>
 </div>
-</#if>
\ No newline at end of file
+</#if>

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl?rev=1705405&r1=1705404&r2=1705405&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl
 (original)
+++ 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl
 Sat Sep 26 10:24:02 2015
@@ -44,15 +44,15 @@ under the License.
 
 
 <#if productCategory??>
-    <#assign categoryName = categoryContentWrapper.get("CATEGORY_NAME")!/>
-    <#assign categoryDescription = categoryContentWrapper.get("DESCRIPTION")!/>
+    <#assign categoryName = categoryContentWrapper.get("CATEGORY_NAME", 
"html")!/>
+    <#assign categoryDescription = categoryContentWrapper.get("DESCRIPTION", 
"html")!/>
     <#if categoryName?has_content>
         <h1>${categoryName}</h1>
     </#if>
     <#if categoryDescription?has_content>
         <h1>${categoryDescription}</h1>
     </#if>
-    <#assign longDescription = 
categoryContentWrapper.get("LONG_DESCRIPTION")!/>
+    <#assign longDescription = categoryContentWrapper.get("LONG_DESCRIPTION", 
"html")!/>
     <#assign categoryImageUrl = 
categoryContentWrapper.get("CATEGORY_IMAGE_URL", "url")!/>
     <#if categoryImageUrl?string?has_content || longDescription?has_content>
       <div>
@@ -104,4 +104,4 @@ under the License.
 <#else>
     <hr />
     <div>${uiLabelMap.ProductNoProductsInThisCategory}</div>
-</#if>
\ No newline at end of file
+</#if>

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl?rev=1705405&r1=1705404&r2=1705405&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl 
(original)
+++ 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl 
Sat Sep 26 10:24:02 2015
@@ -26,7 +26,7 @@ under the License.
     </div>
     <#escape x as x?xml>
       <#if productCategory.productCategoryId != 
currentSearchCategory.productCategoryId>
-        <#assign currentSearchCategoryName = 
categoryContentWrapper.get("CATEGORY_NAME")?string />
+        <#assign currentSearchCategoryName = 
categoryContentWrapper.get("CATEGORY_NAME", "html")?string />
         <#list searchConstraintStrings as searchConstraintString>
           <#if searchConstraintString.indexOf(currentSearchCategoryName) != -1>
             <div id="searchConstraints">&nbsp;<a 
href="<@ofbizUrl>category/~category_id=${productCategoryId}?removeConstraint=${searchConstraintString_index}&amp;clearSearch=N<#if
 
previousCategoryId??>&amp;searchCategoryId=${previousCategoryId}</#if></@ofbizUrl>"
 
class="buttontext">X</a><#noescape>&nbsp;${searchConstraintString}</#noescape></div>
@@ -45,7 +45,7 @@ under the License.
         <ul>
           <#list subCategoryList as category>
             <#assign subCategoryContentWrapper = 
category.categoryContentWrapper />
-            <#assign categoryName = 
subCategoryContentWrapper.get("CATEGORY_NAME")!?string />
+            <#assign categoryName = 
subCategoryContentWrapper.get("CATEGORY_NAME", "html")!?string />
             <li><a 
href="<@ofbizUrl>category/~category_id=${productCategoryId}?SEARCH_CATEGORY_ID${index}=${category.productCategoryId}&amp;searchCategoryId=${category.productCategoryId}&amp;clearSearch=N</@ofbizUrl>">${categoryName!}
 (${category.count})</li>
           </#list>
         </ul>
@@ -72,4 +72,4 @@ under the License.
       </div>
     </#if>
   </div>
-</#if>
\ No newline at end of file
+</#if>

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl?rev=1705405&r1=1705404&r2=1705405&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl
 (original)
+++ 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl
 Sat Sep 26 10:24:02 2015
@@ -34,9 +34,9 @@ under the License.
       <#assign linkUrl = requestAttributes._REQUEST_HANDLER_.makeLink(request, 
response, "category/~category_id=" + productCategoryLink.linkInfo) + 
"/~pcategory=" + productCategoryId/>
       <#assign linkProductCategory = delegator.findOne("ProductCategory", 
Static["org.ofbiz.base.util.UtilMisc"].toMap("productCategoryId", 
productCategoryLink.linkInfo), true)/>
       <#assign linkCategoryContentWrapper = 
Static["org.ofbiz.product.category.CategoryContentWrapper"].makeCategoryContentWrapper(linkProductCategory,
 request)/>
-      <#assign titleText = 
productCategoryLink.titleText?default(linkCategoryContentWrapper.get("CATEGORY_NAME"))!/>
+      <#assign titleText = 
productCategoryLink.titleText?default(linkCategoryContentWrapper.get("CATEGORY_NAME",
 "html"))!/>
       <#assign imageUrl = 
productCategoryLink.imageUrl?default(linkCategoryContentWrapper.get("CATEGORY_IMAGE_URL",
 "url"))!/>
-      <#assign detailText = 
productCategoryLink.detailText?default(linkCategoryContentWrapper.get("DESCRIPTION"))!/>
+      <#assign detailText = 
productCategoryLink.detailText?default(linkCategoryContentWrapper.get("DESCRIPTION",
 "html"))!/>
     </#if>
 
     <div class="productcategorylink">

svn commit: r1705405 - in /ofbiz/trunk: applications/order/webapp/ordermgr/entry/catalog/ applications/product/webapp/catalog/category/ specialpurpose/ecommerce/webapp/ecommerce/catalog/

Reply via email to