svn commit: r919181 - /ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl

[mrisaliti]

Author: mrisaliti
Date: Thu Mar  4 21:00:04 2010
New Revision: 919181

URL: http://svn.apache.org/viewvc?rev=919181&view=rev
Log:
Edit Category Products screen does not more allow to update category member (OFBIZ-3536)

Modified:
    ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl

Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl?rev=919181&r1=919180&r2=919181&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl Thu Mar  4 21:00:04 2010
@@ -50,6 +50,11 @@
           </tr>
           <#if (listSize > 0)>
             <tr><td>
+            <form method="post" action="<@ofbizUrl>updateCategoryProductMember</@ofbizUrl>" name="updateCategoryProductForm">
+              <input type="hidden" name="VIEW_SIZE" value="${viewSize}"/>
+              <input type="hidden" name="VIEW_INDEX" value="${viewIndex}"/>
+              <input type="hidden" name="activeOnly" value="${activeOnly.toString()}">
+              <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}">
               <#assign rowClass = "2">
               <#assign rowCount = 0>
               <#list productCategoryMembers as productCategoryMember>
@@ -59,11 +64,6 @@
                 <#if productCategoryMember.fromDate?exists && nowTimestamp.before(productCategoryMember.getTimestamp("fromDate"))><#assign hasntStarted = true></#if>
                 <#assign hasExpired = false>
                 <#if productCategoryMember.thruDate?exists && nowTimestamp.after(productCategoryMember.getTimestamp("thruDate"))><#assign hasExpired = true></#if>
-                <form method="post" action="<@ofbizUrl>updateCategoryProductMember</@ofbizUrl>" name="updateCategoryProductForm">
-                  <input type="hidden" name="VIEW_SIZE" value="${viewSize}"/>
-                  <input type="hidden" name="VIEW_INDEX" value="${viewIndex}"/>
-                  <input type="hidden" name="activeOnly" value="${activeOnly.toString()}">
-                  <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}">
                   <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
                     <td>
                       <#if (product.smallImageUrl)?exists>
@@ -99,17 +99,21 @@
                           <input type="hidden" value="${productCategoryMembers.size()}" name="_rowCount">
                       </td>
                   </tr>
-                </form>
-                <form name="deleteProductFromCategory_o_${rowCount}" method="post" action="<@ofbizUrl>removeCategoryProductMember</@ofbizUrl>">
-                  <input type="hidden" name="VIEW_SIZE" value="${viewSize}"/>
-                  <input type="hidden" name="VIEW_INDEX" value="${viewIndex}"/>
-                  <input type="hidden" name="productId" value="${(productCategoryMember.productId)?if_exists}">
-                  <input type="hidden" name="productCategoryId" value="${(productCategoryMember.productCategoryId)?if_exists}"/>
-                  <input type="hidden" name="fromDate" value="${productCategoryMember.getString("fromDate")?if_exists}"/>
-                  <input type="hidden" name="activeOnly" value="${activeOnly.toString()}"/>
-                </form>
-                <#assign rowCount = rowCount + 1>
+                  <#assign rowCount = rowCount + 1>
               </#list>
+            </form>
+            <#assign rowCount = 0>
+            <#list productCategoryMembers as productCategoryMember>
+            <form name="deleteProductFromCategory_o_${rowCount}" method="post" action="<@ofbizUrl>removeCategoryProductMember</@ofbizUrl>">
+              <input type="hidden" name="VIEW_SIZE" value="${viewSize}"/>
+              <input type="hidden" name="VIEW_INDEX" value="${viewIndex}"/>
+              <input type="hidden" name="productId" value="${(productCategoryMember.productId)?if_exists}">
+              <input type="hidden" name="productCategoryId" value="${(productCategoryMember.productCategoryId)?if_exists}"/>
+              <input type="hidden" name="fromDate" value="${productCategoryMember.getString("fromDate")?if_exists}"/>
+              <input type="hidden" name="activeOnly" value="${activeOnly.toString()}"/>
+            </form>
+            <#assign rowCount = rowCount + 1>
+            </#list>
           </#if>
         </table>
     </div>