From mboxrd@z Thu Jan  1 00:00:00 1970
From: jparsons@sourceware.org <jparsons@sourceware.org>
Date: 30 Nov 2006 21:24:45 -0000
Subject: [Cluster-devel] conga/luci/cluster form-macros
Message-ID: <20061130212445.15700.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
Changes by:	jparsons at sourceware.org	2006-11-30 21:24:45

Modified files:
	luci/cluster   : form-macros 

Log message:
	fix form pre-fill for fencedevs...part of bz212021

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.113&r2=1.114

--- conga/luci/cluster/form-macros	2006/11/30 20:47:50	1.113
+++ conga/luci/cluster/form-macros	2006/11/30 21:24:45	1.114
@@ -3113,10 +3113,18 @@
 <div metal:define-macro="fencedev-form">
 	<h2>Fence Device Form</h2>
 
-	<div class="cluster fencedev" tal:define="
-		global cur_fence_type python: 'fence_apc';
+	<div class="cluster fencedev">
+  <tal:block tal:define="
 		global cur_fencename request/fencename | nothing;
-		global cur_cluster request/clustername | nothing" >
+		global cur_cluster request/clustername | nothing" />
+
+  <span tal:condition="cur_fencename">
+    <span tal:define="global cur_fencedev python:here.getFence(model,request);
+                      global cur_fence_type cur_fencedev/agent"/>
+  </span>
+  <span tal:condition="not cur_fencename">
+		<span tal:define="global cur_fence_type python: 'fence_apc'"/>
+  </span>
 	
 	<tal:block tal:condition="python: cur_fence_type == 'fence_apc'">
 		<tal:block metal:use-macro="here/form-macros/macros/fence-form-apc" />