More stuff.

svn path=/trunk/web/; revision=135

diff --git a/templates/info.tmpl b/templates/info.tmpl
index aa81dbe..9f014f2 100644 (file)
--- a/templates/info.tmpl
+++ b/templates/info.tmpl
@@ -16,7 +16,7 @@ Info on $machine.name
 </table>
 
 <p>Commands:</p>
-<form action="command">
+<form action="command" action="POST">
   <input type="hidden" name="machine_id" value="$machine.machine_id"/>
   <table>
     
@@ -59,7 +59,7 @@ Info on $machine.name
 (To edit ram and disk size, turn off the machine first.)
 #end if
 </p>
-<form action="modify">
+<form action="modify" method="POST">
   <input type="hidden" name="machine_id" value="$machine.machine_id"/>
   <table>
     <tr><td>Owner:</td><td><input type="text" value="$machine.owner"/></td></tr>

diff --git a/templates/main.py b/templates/main.py
index 36518d6..9493de4 100755 (executable)
--- a/templates/main.py
+++ b/templates/main.py
@@ -41,7 +41,9 @@ def maxDisk(user, machine=None):
     return 10.0
 
 def haveAccess(user, machine):
-    return True
+    if user.username == 'quentin':
+        return True
+    return machine.owner == user.username
 
 def error(op, user, fields, err):
     d = dict(op=op, user=user, errorMessage=str(err))
@@ -268,7 +270,7 @@ def create(user, fields):
                    searchList=d);
 
 def listVms(user, fields):
-    machines = Machine.select()
+    machines = [m for m in Machine.select() if haveAccess(user, m)]    
     on = {}
     has_vnc = {}
     uptimes = getUptimes(machines)