Allow users to change memory of machines if the machine is blessed

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

diff --git a/validation.py b/validation.py
index 0626f86..07b3f3d 100644 (file)
--- a/validation.py
+++ b/validation.py
@@ -37,11 +37,11 @@ def maxMemory(user, machine=None, on=True):
     memory for the machine to change to, if it is left off, is
     returned.
     """
     memory for the machine to change to, if it is left off, is
     returned.
     """

-    if not on:
-        return MAX_MEMORY_SINGLE

     if machine is not None and machine.memory > MAX_MEMORY_SINGLE:
         # If they've been blessed, let them have it
         return machine.memory
     if machine is not None and machine.memory > MAX_MEMORY_SINGLE:
         # If they've been blessed, let them have it
         return machine.memory

+    if not on:
+        return MAX_MEMORY_SINGLE

     machines = getMachinesByOwner(user, machine)
     active_machines = [x for x in machines if g.uptimes[x]]
     mem_usage = sum([x.memory for x in active_machines if x != machine])
     machines = getMachinesByOwner(user, machine)
     active_machines = [x for x in machines if g.uptimes[x]]
     mem_usage = sum([x.memory for x in active_machines if x != machine])