More fixes to hanging query in cherrypy compat

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

diff --git a/code/templates/functions.mako b/code/templates/functions.mako
index 99c0d30..7b46a35 100644 (file)
--- a/code/templates/functions.mako
+++ b/code/templates/functions.mako
@@ -15,19 +15,19 @@ 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>
 
 <%def name="vmTypeList(default=None)">
 % for vmtype in (('linux-hvm', 'HVM'), ('linux', 'ParaVM'), ):
 <label>
-   <input ${'checked="checked"' if default == vmtype[0] else ''} type="radio" name="vmtype" id="vmtype-${vmtype[0]}" value="${vmtype[0]}">${vmtype[1]}</input>
+   <input ${'checked="checked"' if default == vmtype[0] else '' | n} type="radio" name="vmtype" id="vmtype-${vmtype[0]}" value="${vmtype[0]}" />${vmtype[1]}
 </label>
 % endfor
 </%def>
@@ -39,3 +39,16 @@ ${databaseList(sorted(database.Autoinstall.query(), key=lambda x: x.description)
 </tr>
 % endif
 </%def>
+
+<%!
+def jquote(string):
+    return "'" + string.replace('\\', '\\\\').replace("'", "\\'").replace('\n', '\\n') + "'"
+
+def nl2br(string):
+    return string.replace('\n', '<br/>')
+%>
+
+<%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 | jquote})">(?)</a></span>
+</%def>