[OFBiz] SVN: r6118 - in trunk/applications:
ecommerce/webapp/ecommerce/order order/webapp/ordermgr/return
product/webapp/catalog/feature product/webapp/catalog/product
product/webapp/facility/facility product/webapp/facility/inventory
product/webapp/facility/returns product/webapp/facility/shipment
jacopo at svn.ofbiz.org
jacopo at svn.ofbiz.org
Sun Nov 13 04:16:00 EST 2005
Author: jacopo
Date: 2005-11-13 03:15:33 -0600 (Sun, 13 Nov 2005)
New Revision: 6118
Modified:
trunk/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl
trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl
trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl
trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl
trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl
trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl
trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
trunk/applications/product/webapp/facility/returns/receiveReturn.ftl
trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl
Log:
Changed all JavaScript calls to toggleAll, selectAll, checkToggle methods with implicit form name ("selectAllForm") to use new methods with explicit form name. This is needed to fix the bug reported in OFBIZ-564.
Modified: trunk/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl
===================================================================
--- trunk/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl 2005-11-13 01:46:15 UTC (rev 6117)
+++ trunk/applications/ecommerce/webapp/ecommerce/order/requestreturn.ftl 2005-11-13 09:15:33 UTC (rev 6118)
@@ -48,7 +48,7 @@
<td colspan="5"><div class="head3">${uiLabelMap.OrderReturnItemsFromOrder} ${uiLabelMap.OrderNbr}<a href="<@ofbizUrl>orderstatus?order_id=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</div></td>
<td align="right">
<span class="tableheadtext">${uiLabelMap.CommonSelectAll}</span>
- <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this);"/>
+ <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, 'selectAllForm');"/>
</td>
</tr>
<tr>
@@ -104,7 +104,7 @@
</select>
</td>
<td align="right">
- <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this);"/>
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');"/>
</td>
</tr>
<tr><td colspan="6"><hr class="sepbar"/></td></tr>
Modified: trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl 2005-11-13 01:46:15 UTC (rev 6117)
+++ trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl 2005-11-13 09:15:33 UTC (rev 6118)
@@ -44,7 +44,7 @@
<td colspan="7"><div class="head3">Return Item(s) From Order #<a href="<@ofbizUrl>orderview?order_id=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</div></td>
<td align="right">
<span class="tableheadtext">Select All</span>
- <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this);"/>
+ <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, 'selectAllForm');"/>
</td>
</tr>
<tr>
@@ -108,7 +108,7 @@
</select>
</td>
<td align="right">
- <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this);"/>
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');"/>
</td>
</tr>
<tr><td colspan="8"><hr class="sepbar"></td></tr>
Modified: trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/return/returnItems.ftl 2005-11-13 01:46:15 UTC (rev 6117)
+++ trunk/applications/order/webapp/ordermgr/return/returnItems.ftl 2005-11-13 09:15:33 UTC (rev 6118)
@@ -145,7 +145,7 @@
<td colspan="8"><div class="head3">Return Item(s) From Order #${requestParameters.orderId}</div></td>
<td align="right">
<span class="tableheadtext">Select All</span>
- <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this);">
+ <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, 'returnItems');">
</td>
</tr>
<tr>
@@ -208,7 +208,7 @@
</select>
</td>
<td align="right">
- <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this);">
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'returnItems');">
</td>
</tr>
<tr><td colspan="8"><hr class="sepbar"></td></tr>
@@ -238,7 +238,7 @@
</select>
</td>
<td align="right">
- <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this);">
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'returnItems');">
</td>
</tr>
<tr><td colspan="8"><hr class="sepbar"></td></tr>
Modified: trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl 2005-11-13 01:46:15 UTC (rev 6117)
+++ trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl 2005-11-13 09:15:33 UTC (rev 6118)
@@ -68,7 +68,7 @@
<td><div class="tabletext"><b>${uiLabelMap.ProductIdSeqNum}</b></div></td>
<td><div class="tabletext"><b>${uiLabelMap.ProductIdCode}</b></div></td>
<td><div class="tabletext"><b>${uiLabelMap.ProductAbbrev}</b></div></td>
- <td><div class="tabletext"><b>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this);"></div></td>
+ <td><div class="tabletext"><b>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');"></div></td>
</tr>
<#if (listSize > 0)>
<#assign rowCount = 0>
@@ -103,7 +103,7 @@
<td><input type="text" class='inputBox' size='5' name="defaultSequenceNum_o_${rowCount}" value="${productFeature.defaultSequenceNum?if_exists}"></td>
<td><input type="text" class='inputBox' size='5' name="idCode_o_${rowCount}" value="${productFeature.idCode?if_exists}"></td>
<td><input type="text" class='inputBox' size='5' name="abbrev_o_${rowCount}" value="${productFeature.abbrev?if_exists}"></td>
- <td align="right"><input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this);"></td>
+ <td align="right"><input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');"></td>
</tr>
<#assign rowCount = rowCount + 1>
</#list>
Modified: trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl 2005-11-13 01:46:15 UTC (rev 6117)
+++ trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl 2005-11-13 09:15:33 UTC (rev 6118)
@@ -76,7 +76,7 @@
<td><div class="tabletext"><b>${uiLabelMap.CommonThruDate}</b></div></td>
<td><div class="tabletext"><b>${uiLabelMap.ProductAmount}</b></div></td>
<td><div class="tabletext"><b>${uiLabelMap.CommonSequence}</b></div></td>
- <td><div class="tabletext"><b>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this);"></div></td>
+ <td><div class="tabletext"><b>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');"></div></td>
</tr>
<#assign rowCount = 0>
<#if (listSize > 0)>
@@ -99,7 +99,7 @@
<td><input type="text" size="6" name="amount_o_${rowCount}" class="inputBox" value="${productFeature.defaultAmount?if_exists}"></td>
<td><input type="text" size="5" name="sequenceNum_o_${rowCount}" class="inputBox" value="${productFeature.defaultSequenceNum?if_exists}"></td>
<td align="right">
- <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this);">
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');">
</td>
</tr>
<#assign rowCount = rowCount + 1>
Modified: trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl
===================================================================
--- trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl 2005-11-13 01:46:15 UTC (rev 6117)
+++ trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl 2005-11-13 09:15:33 UTC (rev 6118)
@@ -38,7 +38,7 @@
<td><div class="tabletext"><b>${uiLabelMap.ProductCategory}</b></div></td>
<td><div class="tabletext"><b>${uiLabelMap.CommonFromDate}</b></div></td>
<td><div class="tabletext"><b>${uiLabelMap.ProductThruDateAmountSequenceApplicationType}</b></div></td>
- <td><div class="tabletext"><b>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this);"></div></td>
+ <td><div class="tabletext"><b>${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');"></div></td>
<!--<td><div class="tabletext"> </div></td>-->
</tr>
<#assign rowCount = 0>
@@ -78,7 +78,7 @@
</select>
</td>
<td align="right">
- <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this);">
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');">
</td>
<td>
<a href='<@ofbizUrl>RemoveFeatureFromProduct?productId=${(productFeatureAndAppl.productId)?if_exists}&productFeatureId=${(productFeatureAndAppl.productFeatureId)?if_exists}&fromDate=${Static["org.ofbiz.base.util.UtilFormatOut"].encodeQueryValue(productFeatureAndAppl.getTimestamp("fromDate").toString())}</@ofbizUrl>' class="buttontext">
Modified: trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl
===================================================================
--- trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl 2005-11-13 01:46:15 UTC (rev 6117)
+++ trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl 2005-11-13 09:15:33 UTC (rev 6118)
@@ -49,7 +49,7 @@
<td><div class="tableheadtext">${uiLabelMap.OrderConfirm}</div></td>
<td align="right">
<span class="tableheadtext">${uiLabelMap.ProductSelectAll}</span>
- <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this);">
+ <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, 'selectAllForm');">
</td>
</tr>
<#if moveByOisgirInfoList?has_content || moveByPflInfoList?has_content>
@@ -73,7 +73,7 @@
<input type="text" class="inputBox" name="quantityMoved_o_${rowCount}" size="6" value="${totalQuantity?string.number}">
</td>
<td align="right">
- <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this);">
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');">
</td>
</tr>
<#assign rowCount = rowCount + 1>
@@ -98,7 +98,7 @@
<input type="text" class="inputBox" name="quantityMoved_o_${rowCount}" size="6" value="${totalQuantity?string.number}">
</td>
<td align="right">
- <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this);">
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');">
</td>
</tr>
<#assign rowCount = rowCount + 1>
Modified: trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
===================================================================
--- trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl 2005-11-13 01:46:15 UTC (rev 6117)
+++ trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl 2005-11-13 09:15:33 UTC (rev 6118)
@@ -321,7 +321,7 @@
</td>
<td align="right">
<span class="tableheadtext">${uiLabelMap.CommonSelectAll}</span>
- <input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this);">
+ <input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');">
</td>
</tr>
<#list purchaseOrderItems as orderItem>
@@ -441,7 +441,7 @@
</table>
</td>
<td align="right">
- <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="${uiLabelMap.CommonY}" onclick="javascript:checkToggle(this);">
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="${uiLabelMap.CommonY}" onclick="javascript:checkToggle(this, 'selectAllForm');">
</td>
</tr>
<#assign rowCount = rowCount + 1>
@@ -474,7 +474,7 @@
</table>
<input type="hidden" name="_rowCount" value="${rowCount}">
</form>
- <script language="JavaScript" type="text/javascript">selectAll();</script>
+ <script language="JavaScript" type="text/javascript">selectAll('selectAllForm');</script>
<#-- Initial Screen -->
<#else>
Modified: trunk/applications/product/webapp/facility/returns/receiveReturn.ftl
===================================================================
--- trunk/applications/product/webapp/facility/returns/receiveReturn.ftl 2005-11-13 01:46:15 UTC (rev 6117)
+++ trunk/applications/product/webapp/facility/returns/receiveReturn.ftl 2005-11-13 09:15:33 UTC (rev 6118)
@@ -80,7 +80,7 @@
</td>
<td align="right">
<span class="tableheadtext">${uiLabelMap.ProductSelectAll}</span>
- <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this);">
+ <input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, 'selectAllForm');">
</td>
</tr>
@@ -197,7 +197,7 @@
</table>
</td>
<td align="right">
- <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this);">
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');">
</td>
</tr>
<#assign rowCount = rowCount + 1>
@@ -230,7 +230,7 @@
</table>
<input type="hidden" name="_rowCount" value="${rowCount}">
</form>
- <script language="JavaScript" type="text/javascript">selectAll();</script>
+ <script language="JavaScript" type="text/javascript">selectAll('selectAllForm');</script>
<#-- Initial Screen -->
<#else>
Modified: trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl
===================================================================
--- trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl 2005-11-13 01:46:15 UTC (rev 6117)
+++ trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl 2005-11-13 09:15:33 UTC (rev 6118)
@@ -90,7 +90,7 @@
<td><div class="tableheadtext">${uiLabelMap.ProductIssue}</div></td>
<td align="right">
<div class="tableheadtext">${uiLabelMap.CommonSubmit} ?</div>
- <div class="tableheadtext">${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this);"></div>
+ <div class="tableheadtext">${uiLabelMap.CommonAll}<input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');"></div>
</td>
</tr>
<#list orderItemDatas?if_exists as orderItemData>
@@ -150,7 +150,7 @@
<input type="text" class='inputBox' size="5" name="quantity_o_${rowCount}" value="${quantityNotIssued}"/>
</td>
<td align="right">
- <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this);">
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');">
</td>
<#assign rowCount = rowCount + 1>
<#else>
@@ -194,7 +194,7 @@
<input type="text" class='inputBox' size="5" name="quantity_o_${rowCount}" value="${(orderItemShipGrpInvResData.shipmentPlanQuantity)?default(availableQuantity)}"/>
</td>
<td align="right">
- <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this);">
+ <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');">
</td>
<#assign rowCount = rowCount + 1>
<#else>
@@ -211,7 +211,7 @@
</table>
<input type="hidden" name="_rowCount" value="${rowCount}">
</form>
- <script language="JavaScript" type="text/javascript">selectAll();</script>
+ <script language="JavaScript" type="text/javascript">selectAll('selectAllForm');</script>
</#if>
<#else>
More information about the Svn
mailing list