You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2009/05/15 06:27:06 UTC
svn commit: r775000 -
/ofbiz/branches/release09.04/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
Author: ashish
Date: Fri May 15 04:27:06 2009
New Revision: 775000
URL: http://svn.apache.org/viewvc?rev=775000&view=rev
Log:
Applied fix from trunk for revision: 774999
Applied patch from jira issue OFBIZ-2468 (Links to delete Product promo category and product promo product are not working)
Modified:
ofbiz/branches/release09.04/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
Modified: ofbiz/branches/release09.04/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl?rev=775000&r1=774999&r2=775000&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original)
+++ ofbiz/branches/release09.04/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Fri May 15 04:27:06 2009
@@ -45,8 +45,11 @@
</td>
<td align="center">
<#if (productPromoConds.size() == 0 && productPromoActions.size() == 0)>
- <a href="<@o...@ofbizUrl>" class="buttontext">
- ${uiLabelMap.CommonDelete}</a>
+ <form name="deleteProductPromoRule_${productPromoRule_index}" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}">
+ <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)?if_exists}">
+ <a href="javascript:document.deleteProductPromoRule_${productPromoRule_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+ </form>
</#if>
</td>
</tr>
@@ -109,8 +112,15 @@
- ${(condApplEnumeration.get("description",locale))?default(condProductPromoCategory.productPromoApplEnumId)}
- ${uiLabelMap.ProductSubCats}? ${condProductPromoCategory.includeSubCategories?default("N")}
- ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${condProductPromoCategory.andGroupId}
- <a href="<@o...@ofbizUrl>" class="buttontext">
- ${uiLabelMap.CommonDelete}</a>
+ <form name="deleteProductPromoCategory_${productPromoRule_index}_${condProductPromoCategory_index}_${productPromoCond_index}" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="productPromoId" value="${(condProductPromoCategory.productPromoId)?if_exists}">
+ <input type="hidden" name="productPromoRuleId" value="${(condProductPromoCategory.productPromoRuleId)?if_exists}">
+ <input type="hidden" name="productPromoActionSeqId" value="${(condProductPromoCategory.productPromoActionSeqId)?if_exists}">
+ <input type="hidden" name="productPromoCondSeqId" value="${(condProductPromoCategory.productPromoCondSeqId)?if_exists}">
+ <input type="hidden" name="productCategoryId" value="${(condProductPromoCategory.productCategoryId)?if_exists}">
+ <input type="hidden" name="andGroupId" value="${(condProductPromoCategory.andGroupId)?if_exists}">
+ <a href="javascript:document.deleteProductPromoCategory_${productPromoRule_index}_${condProductPromoCategory_index}_${productPromoCond_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+ </form>
</div>
</#list>
<div>
@@ -143,8 +153,14 @@
<div>
${(condProduct.internalName)?if_exists} [${condProductPromoProduct.productId}]
- ${(condApplEnumeration.get("description",locale))?default(condProductPromoProduct.productPromoApplEnumId)}
- <a href="<@o...@ofbizUrl>" class="buttontext">
- ${uiLabelMap.CommonDelete}</a>
+ <form name="deleteProductPromoProduct_${productPromoRule_index}_${productPromoCond_index}_${condProductPromoProduct_index}" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="productPromoId" value="${(condProductPromoProduct.productPromoId)?if_exists}">
+ <input type="hidden" name="productPromoRuleId" value="${(condProductPromoProduct.productPromoRuleId)?if_exists}">
+ <input type="hidden" name="productPromoActionSeqId" value="${(condProductPromoProduct.productPromoActionSeqId)?if_exists}">
+ <input type="hidden" name="productPromoCondSeqId" value="${(condProductPromoProduct.productPromoCondSeqId)?if_exists}">
+ <input type="hidden" name="productId" value="${(condProductPromoProduct.productId)?if_exists}">
+ <a href="javascript:document.deleteProductPromoProduct_${productPromoRule_index}_${productPromoCond_index}_${condProductPromoProduct_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+ </form>
</div>
</#list>
<div>
@@ -164,8 +180,12 @@
</div>
</td>
<td align="center">
- <a href="<@o...@ofbizUrl>" class="buttontext">
- ${uiLabelMap.CommonDelete}</a>
+ <form name="deleteProductPromoCond_${productPromoRule_index}_${productPromoCond_index}" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="productPromoId" value="${(productPromoCond.productPromoId)?if_exists}">
+ <input type="hidden" name="productPromoRuleId" value="${(productPromoCond.productPromoRuleId)?if_exists}">
+ <input type="hidden" name="productPromoCondSeqId" value="${(productPromoCond.productPromoCondSeqId)?if_exists}">
+ <a href="javascript:document.deleteProductPromoCond_${productPromoRule_index}_${productPromoCond_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+ </form>
</td>
</tr>
</#list>
@@ -238,8 +258,15 @@
- ${(actionApplEnumeration.get("description",locale))?default(actionProductPromoCategory.productPromoApplEnumId)}
- ${uiLabelMap.ProductSubCats}? ${actionProductPromoCategory.includeSubCategories?default("N")}
- ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${actionProductPromoCategory.andGroupId}
- <a href="<@o...@ofbizUrl>" class="buttontext">
- ${uiLabelMap.CommonDelete}</a>
+ <form name="deleteProductPromoCategory_${productPromoRule_index}_${productPromoAction_index}_${actionProductPromoCategory_index}" action="<@o...@ofbizUrl>" method="post">
+ <input type="hidden" name="productPromoId" value="${(actionProductPromoCategory.productPromoId)?if_exists}">
+ <input type="hidden" name="productPromoRuleId" value="${(actionProductPromoCategory.productPromoRuleId)?if_exists}">
+ <input type="hidden" name="productPromoCondSeqId" value="${(actionProductPromoCategory.productPromoCondSeqId)?if_exists}">
+ <input type="hidden" name="productPromoActionSeqId" value="${(actionProductPromoCategory.productPromoActionSeqId)?if_exists}">
+ <input type="hidden" name="productCategoryId" value="${(actionProductPromoCategory.productCategoryId)?if_exists}">
+ <input type="hidden" name="andGroupId" value="${(actionProductPromoCategory.andGroupId)?if_exists}">
+ <a href="javascript:document.deleteProductPromoCategory_${productPromoRule_index}_${productPromoAction_index}_${actionProductPromoCategory_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+ </form>
</div>
</#list>
<div>
@@ -272,8 +299,14 @@
<div>
${(actionProduct.internalName)?if_exists} [${actionProductPromoProduct.productId}]
- ${(actionApplEnumeration.get("description",locale))?default(actionProductPromoProduct.productPromoApplEnumId)}
- <a href="<@o...@ofbizUrl>" class="buttontext">
- ${uiLabelMap.CommonDelete}</a>
+ <form name="deleteProductPromoProduct_${productPromoRule_index}_${productPromoAction_index}_${actionProductPromoProduct_index}" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="productPromoId" value="${(actionProductPromoProduct.productPromoId)?if_exists}">
+ <input type="hidden" name="productPromoRuleId" value="${(actionProductPromoProduct.productPromoRuleId)?if_exists}">
+ <input type="hidden" name="productPromoCondSeqId" value="${(actionProductPromoProduct.productPromoCondSeqId)?if_exists}">
+ <input type="hidden" name="productPromoActionSeqId" value="${(actionProductPromoProduct.productPromoActionSeqId)?if_exists}">
+ <input type="hidden" name="productId" value="${(actionProductPromoProduct.productId)?if_exists}">
+ <a href="javascript:document.deleteProductPromoProduct_${productPromoRule_index}_${productPromoAction_index}_${actionProductPromoProduct_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+ </form>
</div>
</#list>
<div>
@@ -293,8 +326,12 @@
</div>
</td>
<td align="center">
- <a href="<@o...@ofbizUrl>" class="buttontext">
- ${uiLabelMap.CommonDelete}</a>
+ <form name="deleteProductPromoAction_${productPromoRule_index}_${productPromoAction_index}" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="productPromoId" value="${(productPromoAction.productPromoId)?if_exists}">
+ <input type="hidden" name="productPromoRuleId" value="${(productPromoAction.productPromoRuleId)?if_exists}">
+ <input type="hidden" name="productPromoActionSeqId" value="${(productPromoAction.productPromoActionSeqId)?if_exists}">
+ <a href="javascript:document.deleteProductPromoAction_${productPromoRule_index}_${productPromoAction_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+ </form>
</td>
</tr>
</#list>
@@ -357,8 +394,15 @@
- ${(promoApplEnumeration.get("description",locale))?default(promoProductPromoCategory.productPromoApplEnumId)}
- ${uiLabelMap.ProductSubCats}? ${promoProductPromoCategory.includeSubCategories?default("N")}
- ${uiLabelMap.CommonAnd} ${uiLabelMap.CommonGroup}: ${promoProductPromoCategory.andGroupId}
- <a href="<@o...@ofbizUrl>" class="buttontext">
- ${uiLabelMap.CommonDelete}</a>
+ <form name="deleteProductPromoCategory_${promoProductPromoCategory_index}" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="productPromoId" value="${(promoProductPromoCategory.productPromoId)?if_exists}">
+ <input type="hidden" name="productPromoRuleId" value="${(promoProductPromoCategory.productPromoRuleId)?if_exists}">
+ <input type="hidden" name="productPromoActionSeqId" value="${(promoProductPromoCategory.productPromoActionSeqId)?if_exists}">
+ <input type="hidden" name="productPromoCondSeqId" value="${(promoProductPromoCategory.productPromoCondSeqId)?if_exists}">
+ <input type="hidden" name="productCategoryId" value="${(promoProductPromoCategory.productCategoryId)?if_exists}">
+ <input type="hidden" name="andGroupId" value="${(promoProductPromoCategory.andGroupId)?if_exists}">
+ <a href="javascript:document.deleteProductPromoCategory_${promoProductPromoCategory_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+ </form>
</div>
</#list>
<div>
@@ -396,8 +440,14 @@
<div>
${(promoProduct.internalName)?if_exists} [${promoProductPromoProduct.productId}]
- ${(promoApplEnumeration.get("description",locale))?default(promoProductPromoProduct.productPromoApplEnumId)}
- <a href="<@o...@ofbizUrl>" class="buttontext">
- ${uiLabelMap.CommonDelete}</a>
+ <form name="deleteProductPromoProduct_${promoProductPromoProduct_index}" action="<@o...@ofbizUrl>" method="post">
+ <input type="hidden" name="productPromoId" value="${(promoProductPromoProduct.productPromoId)?if_exists}">
+ <input type="hidden" name="productPromoRuleId" value="${(promoProductPromoProduct.productPromoRuleId)?if_exists}">
+ <input type="hidden" name="productPromoActionSeqId" value="${(promoProductPromoProduct.productPromoActionSeqId)?if_exists}">
+ <input type="hidden" name="productPromoCondSeqId" value="${(promoProductPromoProduct.productPromoCondSeqId)?if_exists}">
+ <input type="hidden" name="productId" value="${(promoProductPromoProduct.productId)?if_exists}">
+ <a href="javascript:document.deleteProductPromoProduct_${promoProductPromoProduct_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a>
+ </form>
</div>
</#list>
<div>