[Cluster-devel] conga/luci cluster/fence_device.js cluster/res ...

[Cluster-devel] conga/luci cluster/fence_device.js cluster/res ...

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2010-08-07 02:39:59

Modified files:
	luci/cluster   : fence_device.js resource_form_handlers.js 
	luci/plone-custom: conga.js 

Log message:
	Fix rhbz#513004 - Conga does not remember SAP database type in IE6/8 from shared resource

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/fence_device.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.2.2.8&r2=1.2.2.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.20.2.18&r2=1.20.2.19
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/conga.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.2.9&r2=1.3.2.10

--- conga/luci/cluster/fence_device.js	2008/01/23 04:44:30	1.2.2.8
+++ conga/luci/cluster/fence_device.js	2010/08/07 02:39:58	1.2.2.9
@@ -26,7 +26,7 @@
 
 	var fi_form = document.getElementById(fence_type + '_instance');
 	if (fi_form) {
-		var cloned_iform = fi_form.cloneNode(1);
+		var cloned_iform = clone_element(fi_form, true);
 		var fencei_name = fi_cont_id + '_' + num_fence_instances[fi_cont_id]++;
 		cloned_iform.id = fencei_name;
 		cloned_iform.name = fencei_name;
@@ -68,7 +68,7 @@
 		container_element.removeChild(container_element.firstChild);
 	}
 
-	var target = child_element.cloneNode(1);
+	var target = clone_element(child_element, true);
 	target.id = null;
 	container_element.appendChild(target);
 }
@@ -91,7 +91,7 @@
 		container_element.removeChild(container_element.firstChild);
 	}
 
-	var target = child_element.cloneNode(1);
+	var target = clone_element(child_element, true);
 	target.id = '';
 
 	var fence_type = fence_id;
@@ -105,6 +105,10 @@
 				}
 			}
 		}
+		input_tags = target.getElementsByTagName('select');
+		for (var i = 0 ; i < input_tags.length ; i++) {
+			input_tags[i].disabled = true;
+		}
 	}
 
 	var target_form = document.createElement('form');
@@ -119,7 +123,7 @@
 		idiv.id = container_id + '_instances';
 		idiv.name = idiv.id;
 
-		var cloned_iform = fi_form.cloneNode(1);
+		var cloned_iform = clone_element(fi_form, true);
 		cloned_iform.id = container_id + '_0';
 		cloned_iform.name = cloned_iform.id;
 		cloned_iform.className = 'fence_instance';
@@ -190,7 +194,7 @@
 	div_elem.id = 'fence' + fence_level + '_' + level_num_fences;
 	div_elem.className = 'fence_level';
 
-	var chooser_elem = chooser_elem_orig.cloneNode(1);
+	var chooser_elem = clone_element(chooser_elem_orig, true);
 	chooser_elem.id = null;
 	chooser_elem.className = null;
 
--- conga/luci/cluster/resource_form_handlers.js	2009/05/21 13:32:04	1.20.2.18
+++ conga/luci/cluster/resource_form_handlers.js	2010/08/07 02:39:59	1.20.2.19
@@ -17,7 +17,7 @@
 	if (!res || !replace)
 		return (-1);
 
-	var clres = res.cloneNode(1);
+	var clres = clone_element(res, true);
 	clres.id = null;
 	clres.className = null;
 
@@ -442,7 +442,7 @@
 		}
 	}
 
-	var node = sdiv.cloneNode(1);
+	var node = clone_element(sdiv, true);
 	node.id = null;
 	node.className = null;
 
--- conga/luci/plone-custom/conga.js	2010/08/05 17:33:05	1.3.2.9
+++ conga/luci/plone-custom/conga.js	2010/08/07 02:39:59	1.3.2.10
@@ -272,3 +272,13 @@
 	}
 	return (new_tab);
 }
+
+function clone_element(orig_element, deep) {
+	var orig_select = orig_element.getElementsByTagName('select');
+	var cloned_element = orig_element.cloneNode(deep);
+	var cloned_select = cloned_element.getElementsByTagName('select');
+	for (var i = 0 ; i < orig_select.length ; i++) {
+		cloned_select[i].selectedIndex = orig_select[i].selectedIndex;
+	}
+	return (cloned_element);
+}