Correct the incomplete fix from r1155

[invirt/packages/invirt-web.git] / code / templates / functions.tmpl

diff --git a/code/templates/functions.tmpl b/code/templates/functions.tmpl
index 0854e6f..86dc772 100644 (file)
--- a/code/templates/functions.tmpl
+++ b/code/templates/functions.tmpl
@@ -1,3 +1,4 @@
+#filter WebSafe
 #def databaseList($lst, $default, $onchange, $name, $id, $valueattr, $descattr)
 <select name="$name" id="$id"#slurp
 #if $onchange is not None
@@ -18,22 +19,25 @@ onchange="$onchange"#slurp
 #end def
 
 #def cdromList($default="", $onchange=None)
-$databaseList(sorted($sipb_xen_database.CDROM.select(), key=lambda x: x.description),
+#filter None
+$databaseList(sorted($database.CDROM.query(), key=lambda x: x.description),
               default, onchange, 'cdrom', 'cdromlist', 'cdrom_id', 'description')
+#end filter
 #end def
 
 #def autoList($default="", $onchange=None)
-$databaseList(sorted($sipb_xen_database.Autoinstall.select(), key=lambda x: x.description),
+#filter None
+$databaseList(sorted($database.Autoinstall.query(), key=lambda x: x.description),
               default, onchange, 'autoinstall', 'autoinstalllist', 'autoinstall_id', 'description')
-## $databaseList(autos, default, onchange, 'autoinstall', 'autoinstalllist', 'autoinstall_id', 'description')
+#end filter
 #end def
 
 #def vmTypeList($default=None)
-#for $vmtype in sorted($sipb_xen_database.Type.select(), key=lambda x: x.description)
+#for $vmtype in (('linux-hvm', 'HVM'), ('linux', 'ParaVM'), )
 <label>
    <input #slurp
-#if $default == $vmtype then 'checked' else ''
- type="radio" name="vmtype" value="${vmtype.type_id}">${vmtype.description}</input>
+#if $default == $vmtype[0] then 'checked' else ''
+ type="radio" name="vmtype" id="vmtype-${vmtype[0]}" value="${vmtype[0]}">${vmtype[1]}</input>
 </label>
 #end for
 #end def
@@ -53,5 +57,7 @@ $databaseList(sorted($sipb_xen_database.Autoinstall.select(), key=lambda x: x.de
 </tr>
 #end if
 #end def
-
-$full_body
\ No newline at end of file
+#filter None
+$full_body
+#end filter
+#end filter