From mboxrd@z Thu Jan  1 00:00:00 1970
From: jparsons@sourceware.org <jparsons@sourceware.org>
Date: 30 Jan 2007 21:06:13 -0000
Subject: [Cluster-devel] conga/luci/cluster form-macros
Message-ID: <20070130210613.8783.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	2007-01-30 21:06:12

Modified files:
	luci/cluster   : form-macros 

Log message:
	Fix for VM forms

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

--- conga/luci/cluster/form-macros	2007/01/29 16:56:50	1.164
+++ conga/luci/cluster/form-macros	2007/01/30 21:06:12	1.165
@@ -3650,7 +3650,8 @@
 </div>
 
 <div metal:define-macro="xenvmadd-form">
-  <form method="get" action="" tal:attributes="action python:request['baseurl'] + '?clustername=' + request['clustername'] + '&pagetype=29'">
+  <span tal:define="global vmforminfo python: here.getXenVMInfo(modelb, request)/>
+  <form method="get" action="" tal:attributes="action vmforminfo/formurl">
   <h4>Path to configuration file: </h4><input type="text" name="xenvmpath" value=""/>
   <h4>Name of configuration file: </h4><input type="text" name="xenvmname" value=""/>
   <input type="submit" value="Create Xen VM"/>
@@ -3660,7 +3661,7 @@
 <div metal:define-macro="xenvmconfig-form">
   <h4>Properties for Xen VM <font color="green"><span tal:content="request/servicename"/></font></h4>
   <span tal:define="global xeninfo python:here.getXenVMInfo(modelb, request)">
-  <form method="get" action="" tal:attributes="action python:request['baseurl'] + '?clustername=' + request['clustername'] + '&pagetype=29&servicename=' + request['servicename']">
+  <form method="get" action="" tal:attributes="action xeninfo/formurl">
   <h4>Path to configuration file: </h4><input type="text" name="xenvmpath" value="" tal:attributes="value xeninfo/path"/>
   <h4>Name of configuration file: </h4><input type="text" name="xenvmname" value="" tal:attributes="value xeninfo/name"/>
   <input type="button" value="Delete"/>