svn commit: r593111 - in /ofbiz/trunk/applications/product/webapp/catalog: price/EditProductPriceRules.ftl promo/EditProductPromoRules.ftl

[jacopoc]

Author: jacopoc
Date: Thu Nov  8 02:08:20 2007
New Revision: 593111

URL: http://svn.apache.org/viewvc?rev=593111&view=rev
Log:
Removed old and unused code that was treating the ruleActionSeqId field as a numeric field instead as a string.

Modified:
    ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl
    ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl

Modified: ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl?rev=593111&r1=593110&r2=593111&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/price/EditProductPriceRules.ftl Thu Nov  8 02:08:20 2007
@@ -142,12 +142,8 @@
             <td width="85%"><div class="tabletext"><b>${uiLabelMap.ProductActionTypeAmount}</b></div></td>
             <td width="10%"><div class="tabletext"><b>&nbsp;</b></div></td>
           </tr>
-          <#assign maxActionSeqId = 1>
           <#list productPriceActions as productPriceAction>
               <tr>
-                <#-- if cur seq id is a number and is greater than max, set new max for input box prefill below -->
-                <#assign curActionSeqId = productPriceAction.productPriceActionSeqId?number>
-                <#if (curActionSeqId >= maxActionSeqId)><#assign maxActionSeqId = curActionSeqId + 1></#if>
                 <td><div class="tabletext"><b>${productPriceAction.productPriceActionSeqId}</b></div></td>
                 <td align="left">
                     <FORM method="post" action="<@ofbizUrl>updateProductPriceAction</@ofbizUrl>">

Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl?rev=593111&r1=593110&r2=593111&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl Thu Nov  8 02:08:20 2007
@@ -195,16 +195,8 @@
             <td align="right"><div class="tabletext">${uiLabelMap.ProductActions} :</div></td>
             <td align="left" colspan="2">
                 <table border="1" cellpadding="2" cellspacing="0">
-                <#assign maxActionSeqId = 1>
                 <#list productPromoActions as productPromoAction>
                     <tr>
-                        <!-- if cur seq id is a number and is greater than max, set new max for input box prefill below -->
-                        <#if (productPromoAction.productPromoActionSeqId)?exists>
-                            <#assign curActionSeqId = Static["java.lang.Integer"].valueOf(productPromoAction.productPromoActionSeqId)>
-                            <#if (curActionSeqId >= maxActionSeqId)>
-                                <#assign maxActionSeqId = curActionSeqId + 1>
-                            </#if>
-                        </#if>
                         <td><div class="tabletext"><b>${(productPromoAction.productPromoActionSeqId)?if_exists}</b></div></td>
                         <td align="left">
                             <div class="tabletext">
@@ -322,7 +314,6 @@
                             <input type="hidden" name="productPromoId" value="${(productPromoRule.productPromoId)?if_exists}">
                             <input type="hidden" name="productPromoRuleId" value="${(productPromoRule.productPromoRuleId)?if_exists}">
                             <span class="tabletext"><b>${uiLabelMap.CommonNew}:</b>&nbsp;</span>
-                            <#-- <input type="text" size="5" name="productPromoActionSeqId" value="${maxActionSeqId?if_exists}" class="inputBox"> -->
                             <select name="productPromoActionEnumId" size="1" class="selectBox">
                                 <#list productPromoActionEnums as productPromoActionEnum>
                                 <option value="${(productPromoActionEnum.enumId)?if_exists}">${(productPromoActionEnum.get("description",locale))?if_exists}</option>