Fixed bug pointed out by Broder with vmtype default and XHTML.

svn path=/trunk/packages/invirt-web/; revision=2189

diff --git a/code/main.py b/code/main.py
index 5de5f9a..e119e0e 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -151,7 +151,7 @@ def parseCreate(username, state, fields):
     kws = dict([(kw, fields.getfirst(kw)) for kw in 'name description owner memory disksize vmtype cdrom autoinstall'.split()])
     validate = validation.Validate(username, state, strict=True, **kws)
     return dict(contact=username, name=validate.name, description=validate.description, memory=validate.memory,
     kws = dict([(kw, fields.getfirst(kw)) for kw in 'name description owner memory disksize vmtype cdrom autoinstall'.split()])
     validate = validation.Validate(username, state, strict=True, **kws)
     return dict(contact=username, name=validate.name, description=validate.description, memory=validate.memory,

-                disksize=validate.disksize, owner=validate.owner, machine_type=validate.vmtype,
+                disksize=validate.disksize, owner=validate.owner, machine_type=getattr(validate, 'vmtype', Defaults.type),

                 cdrom=getattr(validate, 'cdrom', None),
                 autoinstall=getattr(validate, 'autoinstall', None))
 
                 cdrom=getattr(validate, 'cdrom', None),
                 autoinstall=getattr(validate, 'autoinstall', None))
 

diff --git a/code/templates/functions.tmpl b/code/templates/functions.tmpl
index 86dc772..305b4e8 100644 (file)
--- a/code/templates/functions.tmpl
+++ b/code/templates/functions.tmpl
@@ -36,7 +36,7 @@ $databaseList(sorted($database.Autoinstall.query(), key=lambda x: x.description)
 #for $vmtype in (('linux-hvm', 'HVM'), ('linux', 'ParaVM'), )
 <label>
    <input #slurp
 #for $vmtype in (('linux-hvm', 'HVM'), ('linux', 'ParaVM'), )
 <label>
    <input #slurp

-#if $default == $vmtype[0] then 'checked' else ''
+#if $default == $vmtype[0] then 'checked="checked"' else ''

  type="radio" name="vmtype" id="vmtype-${vmtype[0]}" value="${vmtype[0]}">${vmtype[1]}</input>
 </label>
 #end for
  type="radio" name="vmtype" id="vmtype-${vmtype[0]}" value="${vmtype[0]}">${vmtype[1]}</input>
 </label>
 #end for