X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/993da54b4a89c32e9c28b6b31ca01751ac3b86c4..refs/heads/andersk:/code/templates/functions.mako?ds=inline

diff --git a/code/templates/functions.mako b/code/templates/functions.mako
index c57e904..7b46a35 100644
--- a/code/templates/functions.mako
+++ b/code/templates/functions.mako
@@ -15,12 +15,12 @@ onchange="${onchange}"\
 </%def>
 
 <%def name="cdromList(default='', onchange=None)">
-${databaseList(sorted(database.CDROM.query(), key=lambda x: x.description),
+${databaseList(sorted(database.CDROM.query, key=lambda x: x.description),
                default, onchange, 'cdrom', 'cdromlist', 'cdrom_id', 'description')|n}
 </%def>
 
 <%def name="autoList(default='', onchange=None)">
-${databaseList(sorted(database.Autoinstall.query(), key=lambda x: x.description),
+${databaseList(sorted(database.Autoinstall.query, key=lambda x: x.description),
                default, onchange, 'autoinstall', 'autoinstalllist', 'autoinstall_id', 'description')|n}
 </%def>
 
@@ -50,5 +50,5 @@ def nl2br(string):
 
 <%def name="helppopup(subj)">
 ## Return HTML code for a (?) link to a specified help topic
-<span class="helplink"><a href="help?simple=true;subject=${subj | u}" target="_blank" onclick="return helppopup(${subj | u,jquote})">(?)</a></span>
+<span class="helplink"><a href="help?simple=true;subject=${subj | u}" target="_blank" onclick="return helppopup(${subj | jquote})">(?)</a></span>
 </%def>