From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 25 Sep 2006 21:00:15 -0000
Subject: [Cluster-devel] conga/luci site/luci/Extensions/cluster_adapte ...
Message-ID: <20060925210015.10141.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-09-25 21:00:14

Modified files:
	luci/site/luci/Extensions: cluster_adapters.py 
	luci/cluster   : form-macros 

Log message:
	fix a couple of breaindead errors

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.68&r2=1.69
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.69&r2=1.70

--- conga/luci/site/luci/Extensions/cluster_adapters.py	2006/09/25 17:36:02	1.68
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2006/09/25 21:00:14	1.69
@@ -188,6 +188,9 @@
   
 
 def validateAddClusterNode(self, request):
+	errors = list()
+	messages = list()
+
 	try:
 	 	sessionData = request.SESSION.get('checkRet')
 	except:
@@ -196,7 +199,7 @@
 	if 'clusterName' in request.form:
 		clusterName = request.form['clusterName']
 	else:
-		return (False, {'errrors': [ 'Cluster name is missing'] })
+		return (False, {'errors': [ 'Cluster name is missing'] })
 
 	try:
 		numStorage = int(request.form['numStorage'])
@@ -206,7 +209,7 @@
 		errors.append('You must specify at least one node to add to the cluster')
 		return (False, {'errors': [ errors ] })
 
-	ret = validateClusterNodes(sessionData, request, clusterName, numStorage)
+	ret = validateClusterNodes(request, sessionData, clusterName, numStorage)
 	errors.extend(ret[0])
 	cluster_properties = ret[1]
 
--- conga/luci/cluster/form-macros	2006/09/25 16:31:28	1.69
+++ conga/luci/cluster/form-macros	2006/09/25 21:00:14	1.70
@@ -1047,6 +1047,10 @@
 	<form name="adminform" action="" method="post">
 		<input name="numStorage" type="hidden" value="1" />
 		<input name="pagetype" type="hidden" value="15" />
+		<input type="hidden" name="clusterName"
+			tal:attributes="
+				value request/form/clusterName | request/clustername | nothing"
+		/>
 
 		<h2>Add a node to <span tal:replace="request/form/clusterName | request/clustername | string: the cluster" /></h2>