Changeset 2424 for package_branches/invirt-web/cherrypy/code

Timestamp:

Aug 10, 2009, 12:41:46 AM (15 years ago)

Author:

quentin

Message:

Show installer status on the front page, and unbreak the autoinstall fields in validation logic

Location:

package_branches/invirt-web/cherrypy/code

Files:

• main.py (modified) (4 diffs)
• templates/list.mako (modified) (2 diffs)

package_branches/invirt-web/cherrypy/code/main.py

@@ -148 +148 @@
 
     def parseCreate(self, fields):
-        kws = dict([(kw, fields.get(kw)) for kw in 'name description owner memory disksize vmtype cdrom autoinstall'.split()])
+        kws = dict([(kw, fields.get(kw)) for kw in 'name description owner memory disksize vmtype cdrom autoinstall'.split() if fields.get(kw)])
         validate = validation.Validate(cherrypy.request.login, cherrypy.request.state, strict=True, **kws)
         return dict(contact=cherrypy.request.login, name=validate.name, description=validate.description, memory=validate.memory,
@@ -375 +375 @@
     on = {}
     has_vnc = {}
+    installing = {}
     xmlist = state.xmlist
     checkpoint.checkpoint('Got uptimes')
-    can_clone = 'ice3' not in state.xmlist_raw
     for m in machines:
         if m not in xmlist:
@@ -390 +390 @@
             else:
                 has_vnc[m] = "ParaVM"
+            if xmlist[m].get('autoinstall'):
+                installing[m] = True
+            else:
+                installing[m] = False
     max_memory = validation.maxMemory(username, state)
     max_disk = validation.maxDisk(username)
@@ -407 +411 @@
              machines=machines,
              has_vnc=has_vnc,
-             can_clone=can_clone)
+             installing=installing)
     return d
 

package_branches/invirt-web/cherrypy/code/templates/list.mako

@@ -85 +85 @@
       <tr> 
         <td rowspan="2">
+        % if machine.uptime and installing[machine]:
+        <img src="static/power_installing.png" alt="Installing..." />
+        % else:
           <form action="machine/${machine.machine_id}/command/${'shutdown' if machine.uptime else 'create'}" method="post">
             <input type="hidden" name="back" value="list"/>
@@ -95 +98 @@
 />
           </form>
+          % endif
         </td>
         <td><a href="machine/${machine.machine_id}">${machine.name}</a></td>