[Cluster-devel] conga ./conga.spec.in.in luci/plone-custom/val ...

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2009-01-29 16:23:21

Modified files:
	.              : conga.spec.in.in 
	luci/plone-custom: validate_auth.js 
	luci/site/luci/var: Data.fs 
	make           : version.in 

Log message:
	Fix bz483067

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.109&r2=1.45.2.110
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/validate_auth.js.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.2&r2=1.1.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/Data.fs.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15.2.39&r2=1.15.2.40
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.48&r2=1.21.2.49

--- conga/conga.spec.in.in	2009/01/26 18:15:11	1.45.2.109
+++ conga/conga.spec.in.in	2009/01/29 16:22:08	1.45.2.110
@@ -327,7 +327,7 @@
 - Fix bz452704 (Unable to add existing RHEL4 clusters with RHEL5.2 Luci)
 - Fix bz467464 (adding qdisk to existing cluster fails to update cman entry in cluster.conf)
 - Fix bz460038 (Conga fs resource error when editing service)
-- Fix incompatibilities with MSIE 6 and lower.
+- Fix bz483067 (adding resource in conga doesn't work in IE)
 
 * Thu Sep 25 2008 Ryan McCabe <rmccabe at redhat.com> 0.12.1-7
 - Fix a typo in the fix for bz459562
--- conga/luci/plone-custom/validate_auth.js	2009/01/26 17:01:21	1.1.2.2
+++ conga/luci/plone-custom/validate_auth.js	2009/01/29 16:22:09	1.1.2.3
@@ -94,16 +94,22 @@
 	var msgs = [];
 	var systems_list = get_systems_list_offsets(errors);
 	var os_str = null;
+	var form_elem = null;
 
 	for (var i = 0 ; i < systems_list.length ; i++) {
 		var cur_node_props = node_props[systems_list[i][0]];
 		var cur_sys_name = systems_list[i][0];
 		var offset = systems_list[i][1];
+
 		try {
 			var addr_elem = document.getElementById('__SYSTEM' + offset + ':Addr');
 			var pwd_elem = document.getElementById('__SYSTEM' + offset + ':Passwd');
 			var fp_elem = document.getElementById('__SYSTEM' + offset + 'Fingerprint');
 
+			if (addr_elem) {
+				form_elem = addr_elem.form;
+			}
+
 			if (cur_node_props['available'] != 'True') {
 				set_form_err(addr_elem);
 				clr_form_err(pwd_elem);
@@ -160,6 +166,13 @@
 
 	if (errors.length > 0) {
 		display_msgs(err_div_id, errors);
+	} else if (form_elem !== null && os_version == 'rhel5') {
+		try {
+			if (form_elem.pagetype.value == '1003') {
+				validate_cluster_create(form_elem);
+			}
+		} catch (e) {
+		}
 	}
 
 	if (msgs.length > 0) {
Binary files /cvs/cluster/conga/luci/site/luci/var/Data.fs	2009/01/26 18:15:12	1.15.2.39 and /cvs/cluster/conga/luci/site/luci/var/Data.fs	2009/01/29 16:22:09	1.15.2.40 differ
rcsdiff: /cvs/cluster/conga/luci/site/luci/var/Data.fs: diff failed
--- conga/make/version.in	2008/09/29 17:11:14	1.21.2.48
+++ conga/make/version.in	2009/01/29 16:23:21	1.21.2.49
@@ -1,2 +1,2 @@
-VERSION=0.12.1
-RELEASE=7
+VERSION=0.12.2
+RELEASE=1