Fix a SQLAlchemy bug in the web ACL caching code

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

diff --git a/code/templates/functions.tmpl b/code/templates/functions.tmpl
index e1ae309..3daf6ad 100644 (file)
--- a/code/templates/functions.tmpl
+++ b/code/templates/functions.tmpl
@@ -20,14 +20,14 @@ onchange="$onchange"#slurp
 
 #def cdromList($default="", $onchange=None)
 #filter None
-$databaseList(sorted($sipb_xen_database.CDROM.select(), key=lambda x: x.description),
+$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)
 #filter None
-$databaseList(sorted($sipb_xen_database.Autoinstall.select(), key=lambda x: x.description),
+$databaseList(sorted($database.Autoinstall.query(), key=lambda x: x.description),
               default, onchange, 'autoinstall', 'autoinstalllist', 'autoinstall_id', 'description')
 #end filter
 #end def
@@ -36,7 +36,7 @@ $databaseList(sorted($sipb_xen_database.Autoinstall.select(), key=lambda x: x.de
 #for $vmtype in (('linux-hvm', 'HVM'), ('linux', 'ParaVM'), )
 <label>
    <input #slurp
-#if $default == $vmtype then 'checked' else ''
+#if $default == $vmtype[0] then 'checked' else ''
  type="radio" name="vmtype" value="${vmtype[0]}">${vmtype[1]}</input>
 </label>
 #end for
@@ -60,4 +60,4 @@ $databaseList(sorted($sipb_xen_database.Autoinstall.select(), key=lambda x: x.de
 #filter None
 $full_body
 #end filter
-#end filter
\ No newline at end of file
+#end filter