cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga ./conga.spec.in.in luci/cluster/resource ...
Date: 18 Apr 2008 04:15:56 -0000	[thread overview]
Message-ID: <20080418041556.31749.qmail@sourceware.org> (raw)

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2008-04-18 04:15:52

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

Log message:
	fix bz442806

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.80&r2=1.45.2.81
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.10&r2=1.21.2.11

--- conga/conga.spec.in.in	2008/04/18 03:28:44	1.45.2.80
+++ conga/conga.spec.in.in	2008/04/18 04:15:52	1.45.2.81
@@ -295,6 +295,7 @@
 - Fix bz441580 (conga should install 'sg3_utils' and start service 'scsi_reserve' when scsi fencing is used)
 - Fix bz441573 ("nodename" field for fence_scsi disabled when adding a new fence device/instance)
 - Fix bz442997 (Luci inserts "hostname" instead of "ipaddr" for rsa II fencing device)
+- Fix bz442806 (luci shows wrong state for 'Monitor link' checkbox in IP resource)
 
 * Wed Feb 27 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.0-6
 - Fix bz434586 (Resource tree does not display multiple children of a parent correctly)
--- conga/luci/cluster/resource-form-macros	2008/03/12 15:13:12	1.21.2.10
+++ conga/luci/cluster/resource-form-macros	2008/04/18 04:15:52	1.21.2.11
@@ -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>



             reply	other threads:[~2008-04-18  4:15 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-04-18  4:15 rmccabe [this message]
  -- strict thread matches above, loose matches on Subject: below --
2008-05-12 17:37 [Cluster-devel] conga ./conga.spec.in.in luci/cluster/resource rmccabe
2008-04-18  4:19 rmccabe
2008-02-07  6:53 rmccabe
2007-11-06 23:05 rmccabe
2007-10-09 20:24 rmccabe
2007-09-20 21:03 rmccabe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080418041556.31749.qmail@sourceware.org \
    --to=rmccabe@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).