From a3ce9fc07f5982d9bf2cc5f080e3998782b90e4f Mon Sep 17 00:00:00 2001
From: Adam Glasgall <adam@crossproduct.net>
Date: Tue, 30 Apr 2013 21:47:15 -0400
Subject: [PATCH] don't pass machine_id twice

---
 code/templates/list.mako |    2 --
 debian/changelog         |    7 +++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/code/templates/list.mako b/code/templates/list.mako
index e6ed39f..777134f 100644
--- a/code/templates/list.mako
+++ b/code/templates/list.mako
@@ -110,8 +110,6 @@ ${self.fn.cdromList(defaults.cdrom, "$('cd_or_auto_cd').checked = true;$('autoin
 	% else:
 	  <form action="machine/${machine.machine_id}/command/${'shutdown' if on else 'create'}" method="post">
 	    <input type="hidden" name="back" value="list"/>
-	    <input type="hidden" name="machine_id"
-		   value="${machine.machine_id}"/>
 <input type="submit" class="power ${'on' if on else 'off'}" name="action" value="${'Shutdown' if on else 'Power on'}"\
 % if on:
  onclick="return confirm('Are you sure you want to power off this VM?');"
diff --git a/debian/changelog b/debian/changelog
index 8ac4965..65f32b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,13 @@ invirt-web (0.1.31) unstable; urgency=low
 
  -- Peter A. Iannucci <iannucci@mit.edu>  Mon, 20 May 2013 09:00:00 -0400
 
+invirt-web (0.1.31~dvorak427glasgall2) precise; urgency=low
+
+  * Don't pass machine_id as both a URL parameter and POST body parameter;
+    it confuses cherrypy.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Tue, 30 Apr 2013 21:45:53 -0400
+
 invirt-web (0.1.31~dvorak427glasgall1) precise; urgency=low
 
   * CherryPy starts a http listener by default now. Remove it before
-- 
1.7.9.5