Author: jleroux
Date: Tue Apr 21 12:59:11 2009 New Revision: 767136 URL: http://svn.apache.org/viewvc?rev=767136&view=rev Log: Applied fix from trunk for revision: 767102 Modified: ofbiz/branches/release09.04/ (props changed) ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryParties.ftl Propchange: ofbiz/branches/release09.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 21 12:59:11 2009 @@ -1 +1 @@ -/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099 +/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102 Modified: ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryParties.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryParties.ftl?rev=767136&r1=767135&r2=767136&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryParties.ftl (original) +++ ofbiz/branches/release09.04/applications/product/webapp/catalog/category/EditCategoryParties.ftl Tue Apr 21 12:59:11 2009 @@ -43,7 +43,7 @@ <#if (productCategoryRole.getTimestamp("fromDate"))?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().before(productCategoryRole.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if> <td <#if hasntStarted> style="color: red;"</#if>>${(productCategoryRole.fromDate)?if_exists}</td> <td align="center"> - <FORM method="post" action="<@ofbizUrl>updatePartyToCategory</@ofbizUrl>" name="lineForm${line}"> + <FORM method="post" action="<@ofbizUrl>updatePartyToCategory</@ofbizUrl>" name="lineForm_update${line}"> <#assign hasExpired = false> <#if (productCategoryRole.getTimestamp("thruDate"))?exists && (Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(productCategoryRole.getTimestamp("thruDate")))> <#assign hasExpired = true></#if> <input type="hidden" name="productCategoryId" value="${(productCategoryRole.productCategoryId)?if_exists}"> @@ -56,7 +56,14 @@ </FORM> </td> <td align="center"> - <a href="<@ofbizUrl>removePartyFromCategory?productCategoryId=${(productCategoryRole.productCategoryId)?if_exists}&partyId=${(productCategoryRole.partyId)?if_exists}&roleTypeId=${(productCategoryRole.roleTypeId)?if_exists}&fromDate=${productCategoryRole.getString("fromDate")}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a> + <FORM method="post" action="<@ofbizUrl>removePartyFromCategory</@ofbizUrl>" name="lineForm_delete${line}"> + <#assign hasExpired = false> + <input type="hidden" name="productCategoryId" value="${(productCategoryRole.productCategoryId)?if_exists}"> + <input type="hidden" name="partyId" value="${(productCategoryRole.partyId)?if_exists}"> + <input type="hidden" name="roleTypeId" value="${(productCategoryRole.roleTypeId)?if_exists}"> + <input type="hidden" name="fromDate" value="${(productCategoryRole.getTimestamp("fromDate"))?if_exists}"> + <INPUT type="submit" value="${uiLabelMap.CommonDelete}" style="font-size: x-small;"> + </FORM> </td> </tr> <#-- toggle the row color --> @@ -94,4 +101,4 @@ </table> </div> </div> -</#if> \ No newline at end of file +</#if> |
Free forum by Nabble | Edit this page |