Author: jleroux
Date: Sun Jul 1 08:25:29 2012
New Revision: 1355862
URL: http://svn.apache.org/viewvc?rev=1355862&view=rev
Log:
"Applied fix from trunk for revision: 1355859"
------------------------------------------------------------------------
r1355859 | jleroux | 2012-07-01 10:23:38 +0200 (dim., 01 juil. 2012) | 1 line
Fixes a bug reported by Krishan Babbar on user ML
------------------------------------------------------------------------
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1355859
Modified:
ofbiz/branches/release10.04/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl?rev=1355862&r1=1355861&r2=1355862&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl
(original)
+++
ofbiz/branches/release10.04/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl
Sun Jul 1 08:25:29 2012
@@ -23,7 +23,14 @@ under the License.
</div>
<div class="screenlet-body">
<#list productPromoCodeEmails as productPromoCodeEmail>
- <div><a
href="<@ofbizUrl>deleteProductPromoCodeEmail?productPromoCodeId=${productPromoCodeEmail.productPromoCodeId}&emailAddress=${productPromoCodeEmail.emailAddress}&productPromoId=${productPromoId}</@ofbizUrl>"
class="buttontext">X</a> ${productPromoCodeEmail.emailAddress}</div>
+ <div>
+ <form
name="deleteProductPromoCodeEmail_${productPromoCodeEmail_index}" method="post"
action="<@ofbizUrl>deleteProductPromoCodeEmail</@ofbizUrl>">
+ <input type="hidden" name="productPromoCodeId"
value="${productPromoCodeEmail.productPromoCodeId}"/>
+ <input type="hidden" name="emailAddress"
value="${productPromoCodeEmail.emailAddress}"/>
+ <input type="hidden" name="productPromoId"
value="${productPromoId}"/>
+ <a
href='javascript:document.deleteProductPromoCodeEmail_${productPromoCodeEmail_index}.submit()'
class='buttontext'>${uiLabelMap.CommonRemove}</a> ${productPromoCodeEmail.emailAddress}
+ </form>
+ </div>
</#list>
<div>
<form method="post"
action="<@ofbizUrl>createProductPromoCodeEmail</@ofbizUrl>" style="margin: 0;">