cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
* [Cluster-devel] conga/luci/cluster resource_form_handlers.js
@ 2007-08-23 15:01 rmccabe
  0 siblings, 0 replies; 5+ messages in thread
From: rmccabe @ 2007-08-23 15:01 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2007-08-23 15:01:58

Modified files:
	luci/cluster   : resource_form_handlers.js 

Log message:
	Fix for 253914 from the RHEL5 branch

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.29.2.5&r2=1.29.2.6

--- conga/luci/cluster/resource_form_handlers.js	2007/08/09 21:28:50	1.29.2.5
+++ conga/luci/cluster/resource_form_handlers.js	2007/08/23 15:01:58	1.29.2.6
@@ -16,12 +16,14 @@
 	var res = document.getElementById(res_id);
 	if (!res || !replace)
 		return (-1);
-	var new_uuid = update_resource_form_uuid(res, form.parent_uuid.value, form.tree_level.value, form.uuid.value);
 
-	var sopt = document.getElementById('gres_chooser');
-	if (sopt)
-		sopt.options[sel.selectedIndex].className = 'invisible';
-	return (replace.parentNode.replaceChild(res, replace));
+	var clres = res.cloneNode(1);
+	clres.id = null;
+	clres.className = null;
+
+	var new_uuid = update_resource_form_uuid(clres, form.parent_uuid.value, form.tree_level.value, form.uuid.value);
+
+	return (replace.parentNode.replaceChild(clres, replace));
 }
 
 function collapse_div(image) {
@@ -333,6 +335,7 @@
 	}
 	div.parentNode.removeChild(div);
 
+/*
 	var globalres = document.getElementById('global_resources_block');
 	if (!globalres)
 		return (0);
@@ -357,6 +360,7 @@
 			sopt[i].className = null;
 		}
 	}
+*/
 	return (0);
 }
 



^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Cluster-devel] conga/luci/cluster resource_form_handlers.js
@ 2007-08-23 15:02 rmccabe
  0 siblings, 0 replies; 5+ messages in thread
From: rmccabe @ 2007-08-23 15:02 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-08-23 15:02:46

Modified files:
	luci/cluster   : resource_form_handlers.js 

Log message:
	Fix for 253914 from the RHEL5 branch

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&r1=1.39&r2=1.40

--- conga/luci/cluster/resource_form_handlers.js	2007/08/08 21:00:06	1.39
+++ conga/luci/cluster/resource_form_handlers.js	2007/08/23 15:02:46	1.40
@@ -16,12 +16,14 @@
 	var res = document.getElementById(res_id);
 	if (!res || !replace)
 		return (-1);
-	var new_uuid = update_resource_form_uuid(res, form.parent_uuid.value, form.tree_level.value, form.uuid.value);
 
-	var sopt = document.getElementById('gres_chooser');
-	if (sopt)
-		sopt.options[sel.selectedIndex].className = 'invisible';
-	return (replace.parentNode.replaceChild(res, replace));
+	var clres = res.cloneNode(1);
+	clres.id = null;
+	clres.className = null;
+
+	var new_uuid = update_resource_form_uuid(clres, form.parent_uuid.value, form.tree_level.value, form.uuid.value);
+
+	return (replace.parentNode.replaceChild(clres, replace));
 }
 
 function collapse_div(image) {
@@ -333,6 +335,7 @@
 	}
 	div.parentNode.removeChild(div);
 
+/*
 	var globalres = document.getElementById('global_resources_block');
 	if (!globalres)
 		return (0);
@@ -357,6 +360,7 @@
 			sopt[i].className = null;
 		}
 	}
+*/
 	return (0);
 }
 



^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Cluster-devel] conga/luci/cluster resource_form_handlers.js
@ 2007-08-23  4:10 rmccabe
  0 siblings, 0 replies; 5+ messages in thread
From: rmccabe @ 2007-08-23  4:10 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-08-23 04:10:37

Modified files:
	luci/cluster   : resource_form_handlers.js 

Log message:
	fix 253914: conga doesn't allow you to reuse nfs export and nfs client resources

Patches:
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.11&r2=1.20.2.12

--- conga/luci/cluster/resource_form_handlers.js	2007/08/08 21:18:46	1.20.2.11
+++ conga/luci/cluster/resource_form_handlers.js	2007/08/23 04:10:37	1.20.2.12
@@ -16,12 +16,14 @@
 	var res = document.getElementById(res_id);
 	if (!res || !replace)
 		return (-1);
-	var new_uuid = update_resource_form_uuid(res, form.parent_uuid.value, form.tree_level.value, form.uuid.value);
 
-	var sopt = document.getElementById('gres_chooser');
-	if (sopt)
-		sopt.options[sel.selectedIndex].className = 'invisible';
-	return (replace.parentNode.replaceChild(res, replace));
+	var clres = res.cloneNode(1);
+	clres.id = null;
+	clres.className = null;
+
+	var new_uuid = update_resource_form_uuid(clres, form.parent_uuid.value, form.tree_level.value, form.uuid.value);
+
+	return (replace.parentNode.replaceChild(clres, replace));
 }
 
 function collapse_div(image) {
@@ -333,6 +335,7 @@
 	}
 	div.parentNode.removeChild(div);
 
+/*
 	var globalres = document.getElementById('global_resources_block');
 	if (!globalres)
 		return (0);
@@ -357,6 +360,7 @@
 			sopt[i].className = null;
 		}
 	}
+*/
 	return (0);
 }
 



^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Cluster-devel] conga/luci/cluster resource_form_handlers.js
@ 2006-10-07 20:12 rmccabe
  0 siblings, 0 replies; 5+ messages in thread
From: rmccabe @ 2006-10-07 20:12 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-10-07 20:12:47

Modified files:
	luci/cluster   : resource_form_handlers.js 

Log message:
	fix the input so that it is properly formed xml

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&r1=1.19&r2=1.20

--- conga/luci/cluster/resource_form_handlers.js	2006/10/04 17:24:58	1.19
+++ conga/luci/cluster/resource_form_handlers.js	2006/10/07 20:12:47	1.20
@@ -402,8 +402,7 @@
 		return (-1);
 
 	/* sort this out in the backend */
-	master_form.form_xml.value = form_xml;
-	/* alert(form_xml); */
+	master_form.form_xml.value = '<formlist>' + form_xml + '</formlist>';
 	if (confirm('Save changes to this service?'))
 		master_form.submit();
 	return (0);



^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Cluster-devel] conga/luci/cluster resource_form_handlers.js
@ 2006-10-04 16:42 rmccabe
  0 siblings, 0 replies; 5+ messages in thread
From: rmccabe @ 2006-10-04 16:42 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-10-04 16:42:05

Modified files:
	luci/cluster   : resource_form_handlers.js 

Log message:
	comment out debugging code

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&r1=1.17&r2=1.18

--- conga/luci/cluster/resource_form_handlers.js	2006/10/02 20:21:47	1.17
+++ conga/luci/cluster/resource_form_handlers.js	2006/10/04 16:42:05	1.18
@@ -403,7 +403,7 @@
 
 	/* sort this out in the backend */
 	master_form.form_xml.value = form_xml;
-	alert(form_xml);
+	/* alert(form_xml); */
 	if (confirm('Save changes to this service?'))
 		master_form.submit();
 	return (0);



^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2007-08-23 15:02 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-23 15:01 [Cluster-devel] conga/luci/cluster resource_form_handlers.js rmccabe
  -- strict thread matches above, loose matches on Subject: below --
2007-08-23 15:02 rmccabe
2007-08-23  4:10 rmccabe
2006-10-07 20:12 rmccabe
2006-10-04 16:42 rmccabe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).