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 2010/06/03 16:19:33 UTC
svn commit: r951007 -
/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl
Author: jleroux
Date: Thu Jun 3 14:19:33 2010
New Revision: 951007
URL: http://svn.apache.org/viewvc?rev=951007&view=rev
Log:
A patch from Sascha Rodekamp "Edit Category FTL ProductCategory Type Select " (https://issues.apache.org/jira/browse/OFBIZ-3794) - OFBIZ-3794
A patch regarding the Category Rollup. This patch affects the edit Category Button Description. Before it was the Category Description if exits now it's a little bit more differentiated. The Category Name should displayed if exists and if not the Category Description
Modified:
ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl
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=951007&r1=951006&r2=951007&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl Thu Jun 3 14:19:33 2010
@@ -54,7 +54,18 @@ under the License.
<#assign hasExpired = false>
<#if productCategoryRollup.thruDate?exists && nowTimestamp.after(productCategoryRollup.getTimestamp("thruDate"))><#assign hasExpired = true></#if>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
- <td><#if curCategory?has_content><a href="<@o...@ofbizUrl>" class="buttontext">${curCategory.description?if_exists} [${curCategory.productCategoryId}]</a></#if></td>
+ <td><#if curCategory?has_content>
+ <a href="<@o...@ofbizUrl>" >
+ <#assign catContentWrapper = Static["org.ofbiz.product.category.CategoryContentWrapper"].makeCategoryContentWrapper(curCategory, request)?if_exists>
+ <#if catContentWrapper?has_content>
+ ${catContentWrapper.get("CATEGORY_NAME")!catContentWrapper.get("DESCRIPTION")!curCategory.categoryName!curCategory.description!}
+ <#else>
+ ${curCategory.categoryName!curCategory.description!}
+ </#if>
+ [${curCategory.productCategoryId}]
+ </a>
+ </#if>
+ </td>
<td <#if hasntStarted>style="color: red;"</#if>>${productCategoryRollup.fromDate}</td>
<td align="center">
<input type="hidden" name="showProductCategoryId${suffix}" value="${productCategoryRollup.productCategoryId}" />
@@ -152,7 +163,18 @@ under the License.
<#assign hasExpired = false>
<#if productCategoryRollup.thruDate?exists && nowTimestamp.after(productCategoryRollup.getTimestamp("thruDate"))><#assign hasExpired = true></#if>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
- <td><#if curCategory?has_content><a href="<@o...@ofbizUrl>" class="buttontext">${curCategory.description?if_exists} [${curCategory.productCategoryId}]</a></#if></td>
+ <td><#if curCategory?has_content>
+ <a href="<@o...@ofbizUrl>" >
+ <#assign catContentWrapper = Static["org.ofbiz.product.category.CategoryContentWrapper"].makeCategoryContentWrapper(curCategory, request)?if_exists>
+ <#if catContentWrapper?has_content>
+ ${catContentWrapper.get("CATEGORY_NAME")!catContentWrapper.get("DESCRIPTION")!curCategory.categoryName!curCategory.description!}
+ <#else>
+ ${curCategory.categoryName!curCategory.description!}
+ </#if>
+ [${curCategory.productCategoryId}]
+ </a>
+ </#if>
+ </td>
<td <#if hasntStarted>style="color: red"</#if>>${productCategoryRollup.fromDate}</td>
<td align="center">
<input type="hidden" name="productCategoryId${suffix}" value="${productCategoryRollup.productCategoryId}" />