From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 18 Apr 2008 04:19:58 -0000
Subject: [Cluster-devel] conga ./conga.spec.in.in luci/cluster/resource ...
Message-ID: <20080418041958.32739.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
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2008-04-18 04:19:57

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

Log message:
	Fix bz443002 (luci shows wrong state for 'Monitor link' checkbox in IP resource)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.25&r2=1.67.2.26
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.31.2.8&r2=1.31.2.9

--- conga/conga.spec.in.in	2008/04/18 03:31:46	1.67.2.25
+++ conga/conga.spec.in.in	2008/04/18 04:19:57	1.67.2.26
@@ -301,6 +301,7 @@
 
 %changelog
 * Tue Mar 25 2008 Ryan McCabe <rmccabe@redhat.com> 0.11.1-2
+- Fix bz443002 (luci shows wrong state for 'Monitor link' checkbox in IP resource)
 - Fix bz442933 (Luci inserts "hostname" instead of "ipaddr" for rsa II fencing device)
 - Fix bz442369 (conga should install 'sg3_utils' and start service 'scsi_reserve' when scsi fencing is used)
 - Fix bz441574 (nodename" field for fence_scsi disabled when adding a new fence device/instance)
--- conga/luci/cluster/resource-form-macros	2008/03/25 01:27:10	1.31.2.8
+++ conga/luci/cluster/resource-form-macros	2008/04/18 04:19:57	1.31.2.9
@@ -387,11 +387,12 @@
 		</tr>
 		<tr class="systemsTable">
 			<td class="systemsTable">Monitor link</td>
-			<td class="systemsTable">
+			<td class="systemsTable"
+				tal:define="monitor_link res/attrs/monitor_link | nothing">
 				<input type="checkbox" name="monitorLink"
 					tal:attributes="
 						disabled python: editDisabled;
-						checked res/attrs/monitor_link | string: checked" />
+						checked python:(monitor_link and monitor_link.lower() == 'true' or monitor_link== '1') and 'checked' or ''" />
 			</td>
 		</tr>
 	</table>