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

[invirt/packages/invirt-web.git] / code / main.py

diff --git a/code/main.py b/code/main.py
index ce523cb..385a2a6 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -203,6 +203,7 @@ def getListDict(user):
     has_vnc = {}
     xmlist = g.xmlist
     checkpoint.checkpoint('Got uptimes')
+    can_clone = 'ice3' not in g.xmlist_raw
     for m in machines:
         if m not in xmlist:
             has_vnc[m] = 'Off'
@@ -232,7 +233,8 @@ def getListDict(user):
              max_disk=max_disk,
              defaults=defaults,
              machines=machines,
-             has_vnc=has_vnc)
+             has_vnc=has_vnc,
+             can_clone=can_clone)
     return d
 
 def listVms(user, fields):
@@ -388,16 +390,16 @@ def modifyDict(user, fields):
 
         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
 
         vm_type = validation.validVmType(fields.getfirst('vmtype'))
         if vm_type is not None:
             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:
                 olddisk[disk.guest_device_name] = disksize
@@ -577,9 +579,9 @@ def infoDict(user, machine):
     checkpoint.checkpoint('Got fields')
 
 
-    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():
         setattr(defaults, name, getattr(machine, name))