[Cluster-devel] conga ./conga.spec.in.in luci/cluster/resource ...

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-09-20 21:03:16

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

Log message:
	Fix 253842: luci ignores File System Resource Configuration

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.82&r2=1.83
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.40&r2=1.41

--- conga/conga.spec.in.in	2007/09/20 05:36:13	1.82
+++ conga/conga.spec.in.in	2007/09/20 21:03:16	1.83
@@ -289,7 +289,10 @@
 
 %changelog
 * Wed Sep 19 2007 Ryan McCabe <rmccabe at redhat.com> 0.12.0-1
-
+- 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)
+- Fixed bz295771 (RFE: add ability to set self_fence attribute for clusterfs resources)
 
 * Mon Aug 27 2007 Ryan McCabe <rmccabe at redhat.com> 0.10.0-6
 - Fixed bz253783
--- conga/luci/cluster/resource-form-macros	2007/09/18 21:45:39	1.40
+++ conga/luci/cluster/resource-form-macros	2007/09/20 21:03:16	1.41
@@ -482,30 +482,40 @@
 		<tr class="systemsTable">
 			<td class="systemsTable">Force unmount</td>
 			<td class="systemsTable">
-				<input type="checkbox" name="forceunmount"
-					tal:attributes="
-						disabled python: editDisabled;
-						checked res/attrs/force_unmount | nothing" />
+				<tal:block tal:define="
+					force_unmount res/attrs/force_unmount | nothing">
+
+					<input type="checkbox" name="forceunmount"
+						tal:attributes="
+							disabled python: editDisabled;
+							checked python:(force_unmount and force_unmount.lower() == 'true' or force_unmount == '1') and 'checked' or ''" />
+				</tal:block>
 			</td>
 		</tr>
 
 		<tr class="systemsTable">
 			<td class="systemsTable">Reboot host node if unmount fails</td>
 			<td class="systemsTable">
-				<input type="checkbox" name="selffence"
-					tal:attributes="
-						disabled python: editDisabled;
-						checked res/attrs/self_fence |  nothing" />
+				<tal:block
+					tal:define="self_fence res/attrs/self_fence | nothing">
+					<input type="checkbox" name="selffence"
+						tal:attributes="
+							disabled python: editDisabled;
+							checked python:(self_fence and self_fence.lower() == 'true' or self_fence == '1') and 'checked' or ''" />
+				</tal:block>
 			</td>
 		</tr>
 
 		<tr class="systemsTable">
 			<td class="systemsTable">Check file system before mounting</td>
 			<td class="systemsTable">
-				<input type="checkbox" name="checkfs"
-					tal:attributes="
-						disabled python: editDisabled;
-						checked res/attrs/force_fsck | nothing" />
+				<tal:block
+					tal:define="force_fsck res/attrs/force_fsck | nothing">
+					<input type="checkbox" name="checkfs"
+						tal:attributes="
+							disabled python: editDisabled;
+							checked python:(force_fsck and force_fsck.lower() == 'true' or force_fsck == '1') and 'checked' or ''" />
+				</tal:block>
 			</td>
 		</tr>
 	</table>
@@ -607,20 +617,27 @@
 		<tr class="systemsTable">
 			<td class="systemsTable">Force unmount</td>
 			<td class="systemsTable">
-				<input type="checkbox" name="forceunmount"
-					tal:attributes="
-						disabled python: editDisabled;
-						checked res/attrs/force_unmount | nothing" />
+				<tal:block tal:define="
+					force_unmount res/attrs/force_unmount | nothing">
+
+					<input type="checkbox" name="forceunmount"
+						tal:attributes="
+							disabled python: editDisabled;
+							checked python:(force_unmount and force_unmount.lower() == 'true' or force_unmount == '1') and 'checked' or ''" />
+				</tal:block>
 			</td>
 		</tr>
 
 		<tr class="systemsTable">
 			<td class="systemsTable">Reboot host node if unmount fails</td>
 			<td class="systemsTable">
-				<input type="checkbox" name="selffence"
-					tal:attributes="
-						disabled python: editDisabled;
-						checked res/attrs/self_fence |  nothing" />
+				<tal:block
+					tal:define="self_fence res/attrs/self_fence | nothing">
+					<input type="checkbox" name="selffence"
+						tal:attributes="
+							disabled python: editDisabled;
+							checked python:(self_fence and self_fence.lower() == 'true' or self_fence == '1') and 'checked' or ''" />
+				</tal:block>
 			</td>
 		</tr>
 	</table>
@@ -738,10 +755,14 @@
 		<tr class="systemsTable">
 			<td class="systemsTable">Force unmount</td>
 			<td class="systemsTable">
-				<input type="checkbox" name="forceunmount"
-					tal:attributes="
-						disabled python: editDisabled;
-						checked res/attrs/force_unmount | nothing" />
+				<tal:block tal:define="
+					force_unmount res/attrs/force_unmount | nothing">
+
+					<input type="checkbox" name="forceunmount"
+						tal:attributes="
+							disabled python: editDisabled;
+							checked python:(force_unmount and force_unmount.lower() == 'true' or force_unmount == '1') and 'checked' or ''" />
+				</tal:block>
 			</td>
 		</tr>
 	</table>