[Cluster-devel] conga ./conga.spec.in.in luci/homebase/form-macros

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2008-01-03 16:27:49

Modified files:
	.              : conga.spec.in.in 
	luci/homebase  : form-macros 

Log message:
	Fixed bz253720: "trust" box shouldn't be an option if it is required

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.90&r2=1.91
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/form-macros.diff?cvsroot=cluster&r1=1.63&r2=1.64

--- conga/conga.spec.in.in	2007/11/06 23:05:06	1.90
+++ conga/conga.spec.in.in	2008/01/03 16:27:48	1.91
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright (C) 2006-2007 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2006-2008 Red Hat, Inc. All rights reserved.
 #
 # This copyrighted material is made available to anyone wishing to use,
 # modify, copy, or redistribute it subject to the terms and conditions
@@ -289,6 +289,7 @@
 
 %changelog
 * Wed Sep 19 2007 Ryan McCabe <rmccabe at redhat.com> 0.12.0-1
+- Fixed bz253720: "trust" box shouldn't be an option if it is required
 - Fixed bz253842 (luci ignores File System Resource Configuration)
 - Fixed bz277661 (RFE: Better instructions on the luci login page if luci_admin not run.)
 - Fixed bz277711 (RFE: luci_admin should check that luci is running before asking for the password)
--- conga/luci/homebase/form-macros	2008/01/02 20:52:23	1.63
+++ conga/luci/homebase/form-macros	2008/01/03 16:27:49	1.64
@@ -392,11 +392,11 @@
 									value sys/fp | nothing" />
 						</td>
 						<td class="systemsTable">
-							<input type="checkbox" checked tal:attributes="
-								id python: '__SYSTEM%dTrusted' % cur_sysnum;
-								name python: '__SYSTEM%dTrusted' % cur_sysnum;
-								disabled python: 'trusted' in sys"
-							/>
+							<input type="checkbox" checked="checked"
+								tal:attributes="
+									id python: '__SYSTEM%dTrusted' % cur_sysnum;
+									name python: '__SYSTEM%dTrusted' % cur_sysnum;
+									disabled python: sys.has_key('trusted')" />
 						</td>
 						<td class="systemsTable">
 							<img src="delete-row.png" class="deleteRow"
@@ -769,8 +769,10 @@
 
 	<h2 class="homebase">Add Cluster</h2>
 
-	<tal:block tal:define="
-		global add_cluster request/SESSION/add_cluster | nothing" />
+	<tal:block
+		tal:define="global add_cluster request/SESSION/add_cluster | nothing" />
+	<tal:block
+		tal:define="global asked_for_certs add_cluster/show_certs | nothing" />
 
 	<form name="adminform" action="" method="post"
 		tal:condition="add_cluster">
@@ -799,8 +801,8 @@
 				<tr class="systemsTable">
 					<th class="systemsTable">Node Hostname</th>
 					<th class="systemsTable">Root Password</th>
-					<th class="systemsTable">Key ID</th>
-					<th class="systemsTable">Trust</th>
+					<th tal:condition="asked_for_certs" class="systemsTable">Key ID</th>
+					<th tal:condition="asked_for_certs" class="systemsTable">Trust</th>
 				</tr>
 
 			</thead>
@@ -872,7 +874,7 @@
 									name python: '__SYSTEM%d:Passwd' % cur_sysnum" />
 						</tal:block>
 					</td>
-					<td class="systemsTable">
+					<td tal:condition="asked_for_certs" class="systemsTable">
 						<img
 							tal:attributes="
 								src python: 'trusted' in sys and 'lock-ok.png' or ('fp' in sys and 'lock-closed.png' or 'lock-open.png');
@@ -884,14 +886,27 @@
 								name python: '__SYSTEM%dFingerprint' % cur_sysnum;
 								value sys/fp | nothing" />
 					</td>
-					<td class="systemsTable">
-						<input type="checkbox" tal:attributes="
-							checked python: add_cluster['pass'] > 0;
-							id python: '__SYSTEM%dTrusted' % cur_sysnum;
-							name python: '__SYSTEM%dTrusted' % cur_sysnum;
-							disabled python: 'trusted' in sys"
-						/>
+					<td tal:condition="asked_for_certs" class="systemsTable">
+						<input type="checkbox"
+							tal:attributes="
+								checked python: sys.has_key('fp') or sys.has_key('trusted');
+								id python: '__SYSTEM%dTrusted' % cur_sysnum;
+								name python: '__SYSTEM%dTrusted' % cur_sysnum;
+								disabled python: sys.has_key('trusted')" />
 					</td>
+					<tal:block tal:condition="python:not asked_for_certs">
+						<input type="hidden" value="1"
+							tal:attributes="
+								id python: '__SYSTEM%dTrusted' % cur_sysnum;
+								name python: '__SYSTEM%dTrusted' % cur_sysnum"
+						/>
+						<input type="hidden"
+							tal:condition="exists: sys/fp"
+							tal:attributes="
+								id python: '__SYSTEM%dFingerprint' % cur_sysnum;
+								name python: '__SYSTEM%dFingerprint' % cur_sysnum;
+								value sys/fp | nothing" />
+					</tal:block>
 				</tr>
 				<tal:block tal:define="global cur_sysnum python: cur_sysnum + 1" />
 			 </tal:block>