projects
/
invirt/packages/invirt-web.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug during create/delete clearing the cache
[invirt/packages/invirt-web.git]
/
validation.py
diff --git
a/validation.py
b/validation.py
index
bb459bf
..
3ed4938
100644
(file)
--- a/
validation.py
+++ b/
validation.py
@@
-37,6
+37,9
@@
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 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)
if not on:
return MAX_MEMORY_SINGLE
machines = getMachinesByOwner(user, machine)
@@
-68,8
+71,6
@@
def validAddVm(user):
def haveAccess(user, machine):
"""Return whether a user has administrative access to a machine"""
def haveAccess(user, machine):
"""Return whether a user has administrative access to a machine"""
- if user == 'moo':
- return True
if user in (machine.administrator, machine.owner):
return True
if getafsgroups.checkAfsGroup(user, machine.administrator,
if user in (machine.administrator, machine.owner):
return True
if getafsgroups.checkAfsGroup(user, machine.administrator,
@@
-81,8
+82,6
@@
def haveAccess(user, machine):
def owns(user, machine):
"""Return whether a user owns a machine"""
def owns(user, machine):
"""Return whether a user owns a machine"""
- if user == 'moo':
- return True
return not getafsgroups.notLockerOwner(user, machine.owner)
def validMachineName(name):
return not getafsgroups.notLockerOwner(user, machine.owner)
def validMachineName(name):