[Cluster-devel] conga/luci cluster/resource_form_handlers.js h ...

Mon Oct 30 21:21:18 UTC 2006

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-10-30 21:21:17

Modified files:
	luci/cluster   : resource_form_handlers.js 
	luci/homebase  : form-macros 
	luci/site/luci/Extensions: ricci_bridge.py 

Log message:
	- fix for javascript FS resource validation (would always say you had not selected a FS type)
	- fix for batchAttemptResult function decl: callers expect to pass only one argument

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&r1=1.20&r2=1.21
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/form-macros.diff?cvsroot=cluster&r1=1.45&r2=1.46
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_bridge.py.diff?cvsroot=cluster&r1=1.36&r2=1.37

--- conga/luci/cluster/resource_form_handlers.js	2006/10/07 20:12:47	1.20
+++ conga/luci/cluster/resource_form_handlers.js	2006/10/30 21:21:16	1.21
@@ -140,7 +140,7 @@
 function validate_filesystem(form) {
 	var errors = new Array();
 
-	if (!form.fsTypeSelect || str_is_blank(form.fsTypeSelect.value)) {
+	if (!form.fstype || str_is_blank(form.fstype.value)) {
 		errors.push('No file system type was given.');
 		set_form_err(form.fsTypeSelect);
 	} else
--- conga/luci/homebase/form-macros	2006/10/30 20:42:03	1.45
+++ conga/luci/homebase/form-macros	2006/10/30 21:21:16	1.46
@@ -1,7 +1,7 @@
 <html>
 
 <tal:comment tal:replace="nothing">
-	$Id: form-macros,v 1.45 2006/10/30 20:42:03 rmccabe Exp $
+	$Id: form-macros,v 1.46 2006/10/30 21:21:16 rmccabe Exp $
 </tal:comment>
 
 <head>
@@ -560,8 +560,6 @@
 	<tal:block tal:condition="python: not request.SESSION.has_key('checkRet')"
 		tal:define="global sessionObj python:{}" />
 
-	<tal:block tal:define="
-
 	<h2 class="homebase">Add Cluster</h2>
 
 	<form name="adminform" action="" method="post"
--- conga/luci/site/luci/Extensions/ricci_bridge.py	2006/10/26 22:59:13	1.36
+++ conga/luci/site/luci/Extensions/ricci_bridge.py	2006/10/30 21:21:17	1.37
@@ -206,7 +206,7 @@
 
 	return minidom.parseString(batch).firstChild
 
-def batchAttemptResult(self, doc):
+def batchAttemptResult(doc):
 	try:
 		batch = doc.getElementsByTagName('batch')
 		if not batch or len(batch) < 1:


