Rename misleading relation from users to acl.

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

diff --git a/cache_acls.py b/cache_acls.py
index 3b68129..353574a 100644 (file)
--- a/cache_acls.py
+++ b/cache_acls.py
@@ -40,8 +40,8 @@ if __name__ == '__main__':
         people.update(expandName(m.administrator))
         print '%s: %s' % (m.name, ' '.join(people))
         transaction = ctx.current.create_transaction()
         people.update(expandName(m.administrator))
         print '%s: %s' % (m.name, ' '.join(people))
         transaction = ctx.current.create_transaction()

-        for u in m.users:
-            ctx.current.delete(u)
+        for a in m.acl:
+            ctx.current.delete(a)

         for p in people:
             ma = MachineAccess(machine_id=m.machine_id, user=p)
             ctx.current.save(ma)
         for p in people:
             ma = MachineAccess(machine_id=m.machine_id, user=p)
             ctx.current.save(ma)

diff --git a/controls.py b/controls.py
index 620402b..2e9b541 100644 (file)
--- a/controls.py
+++ b/controls.py
@@ -201,7 +201,7 @@ def deleteVM(machine):
             ctx.current.save(nic)
         for disk in machine.disks:
             ctx.current.delete(disk)
             ctx.current.save(nic)
         for disk in machine.disks:
             ctx.current.delete(disk)

-        for access in machine.users:
+        for access in machine.acl:

             ctx.current.delete(access)
         ctx.current.delete(machine)
         transaction.commit()
             ctx.current.delete(access)
         ctx.current.delete(machine)
         transaction.commit()