Changeset 566 for trunk/packages

Timestamp:

Jun 2, 2008, 2:21:06 PM (16 years ago)

Author:

ecprice

Message:

Use owner's quota on info page, not user's quota.

File:

• trunk/packages/sipb-xen-www/code/main.py (modified) (3 diffs)

trunk/packages/sipb-xen-www/code/main.py

@@ -391 +391 @@
         memory = fields.getfirst('memory')
         if memory is not None:
-            memory = validation.validMemory(user, memory, machine, on=False)
+            memory = validation.validMemory(owner, memory, machine, on=False)
             machine.memory = memory
 
@@ -398 +398 @@
             machine.type = vm_type
 
-        disksize = validation.testDisk(user, fields.getfirst('disk'))
+        disksize = validation.testDisk(owner, fields.getfirst('disk'))
         if disksize is not None:
-            disksize = validation.validDisk(user, disksize, machine)
+            disksize = validation.validDisk(owner, disksize, machine)
             disk = machine.disks[0]
             if disk.size != disksize:
@@ -580 +580 @@
 
 
-    max_mem = validation.maxMemory(user, machine, False)
+    max_mem = validation.maxMemory(machine.owner, machine, False)
     checkpoint.checkpoint('Got mem')
-    max_disk = validation.maxDisk(user, machine)
+    max_disk = validation.maxDisk(machine.owner, machine)
     defaults = Defaults()
     for name in 'machine_id name administrator owner memory contact'.split():