CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: [EMAIL PROTECTED] 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 <[EMAIL PROTECTED]> 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>
