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 2009/04/21 14:53:28 UTC
svn commit: r767131 - in /ofbiz/branches/release09.04: ./
applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl
Author: jleroux
Date: Tue Apr 21 12:53:27 2009
New Revision: 767131
URL: http://svn.apache.org/viewvc?rev=767131&view=rev
Log:
Applied fix from trunk for revision: 767093
Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 21 12:53:27 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093
Modified: ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl?rev=767131&r1=767130&r2=767131&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl (original)
+++ ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl Tue Apr 21 12:53:27 2009
@@ -46,7 +46,7 @@
<#if (prodCatalogCategory.getTimestamp("fromDate"))?exists && nowTimestamp.before(prodCatalogCategory.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
<td <#if hasntStarted> style="color: red;"</#if>>${(prodCatalogCategory.fromDate)?if_exists}</td>
<td align="center">
- <form method="post" action="<@o...@ofbizUrl>" name="lineForm${line}">
+ <form method="post" action="<@o...@ofbizUrl>" name="lineForm_update${line}">
<#assign hasExpired = false>
<#if (prodCatalogCategory.getTimestamp("thruDate"))?exists && nowTimestamp.after(prodCatalogCategory.getTimestamp("thruDate"))> <#assign hasExpired = true></#if>
<input type="hidden" name="prodCatalogId" value="${(prodCatalogCategory.prodCatalogId)?if_exists}"/>
@@ -72,7 +72,7 @@
</form>
</td>
<td align="center">
- <form method="post" action="<@o...@ofbizUrl>" name="removeProductCategoryFromProdCatalogForm">
+ <form method="post" action="<@o...@ofbizUrl>" name="lineForm_update${line}">
<input type="hidden" name="prodCatalogId" value="${(prodCatalogCategory.prodCatalogId)?if_exists}"/>
<input type="hidden" name="productCategoryId" value="${(prodCatalogCategory.productCategoryId)?if_exists}"/>
<input type="hidden" name="prodCatalogCategoryTypeId" value="${prodCatalogCategory.prodCatalogCategoryTypeId}"/>
@@ -119,4 +119,4 @@
</table>
</div>
</div>
-</#if>
\ No newline at end of file
+</#if>