[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] conga/luci/homebase form-macros



CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe sourceware org	2006-11-01 21:29:49

Modified files:
	luci/homebase  : form-macros 

Log message:
	show the 'check if all node passwords are identical...' box on the cluster add page if the initial submission has errors

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/form-macros.diff?cvsroot=cluster&r1=1.47&r2=1.48

--- conga/luci/homebase/form-macros	2006/11/01 20:43:39	1.47
+++ conga/luci/homebase/form-macros	2006/11/01 21:29:49	1.48
@@ -1,7 +1,7 @@
 <html>
 
 <tal:comment tal:replace="nothing">
-	$Id: form-macros,v 1.47 2006/11/01 20:43:39 rmccabe Exp $
+	$Id: form-macros,v 1.48 2006/11/01 21:29:49 rmccabe Exp $
 </tal:comment>
 
 <head>
@@ -583,8 +583,8 @@
 
 			<tfoot class="systemsTable">
 				<tr class="systemsTable"><td colspan="2" class="systemsTable">
-					<div tal:condition="python: not 'isComplete' in sessionObj['requestResults'] or not sessionObj['requestResults']['isComplete']">
-						<input type="checkbox" name="allSameCheckBox" id="allSameCheckBox" onClick="allPasswdsSame(adminform);"/> Check if storage system passwords are identical.
+					<div tal:condition="python: not 'isComplete' in sessionObj['requestResults'] or not sessionObj['requestResults']['isComplete'] or ('errors' in sessionObj and len(sessionObj['errors']) > 0)">
+						<input type="checkbox" name="allSameCheckBox" id="allSameCheckBox" onClick="allPasswdsSame(adminform);"/> Check if cluster node passwords are identical.
 					</div>
 					<div class="systemsTable"
 						tal:condition="python: 'isComplete' in sessionObj['requestResults'] and sessionObj['requestResults']['isComplete']">&nbsp;</div>
@@ -606,9 +606,9 @@
 							tal:attributes="
 								id python: '__SYSTEM' + str(sysNum) + ':Addr';
 								name python: '__SYSTEM' + str(sysNum) + ':Addr';
-								value python: node['ricci_host'];
+								value python: node['host'];
 								class python: 'hbInputSys' + ('errors' in node and ' error' or '');
-								disabled python: nodeAuth and 1 or 0"
+								disabled python: (nodeAuth and node['host'].count('.') > 0) and 1 or 0"
 						 />
 					</td>
 					<td class="systemsTable">


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]