From: Greg Price <price@mit.edu>
Date: Sun, 20 Dec 2009 03:30:08 +0000 (-0500)
Subject: command: recognize new "internal" name for delete
X-Git-Tag: 0.1.0^2~9
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/commitdiff_plain/6b7e539177038fb72a6df8c93d35854dcc06bd58

command: recognize new "internal" name for delete

This fixes the bug where delete leads back to the now-broken info page.

svn path=/package_branches/invirt-web/cherrypy-rebased/; revision=2726
---

diff --git a/code/main.py b/code/main.py
index 7c04d25..3be15a6 100755
--- a/code/main.py
+++ b/code/main.py
@@ -353,12 +353,12 @@ console will suffer artifacts.
         def command(self, command_name, machine_id, **kwargs):
             """Handler for running commands like boot and delete on a VM."""
             back = kwargs.get('back')
+            if command_name == 'delete':
+                back = 'list'
             try:
                 d = controls.commandResult(cherrypy.request.login,
                                            cherrypy.request.state,
                                            command_name, machine_id, kwargs)
-                if d['command'] == 'Delete VM':
-                    back = 'list'
             except InvalidInput, err:
                 if not back:
                     raise