Update cache for machines on their modification.

svn path=/trunk/packages/sipb-xen-www/; revision=446

diff --git a/code/main.py b/code/main.py
index 3fe04d5..de28a63 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -39,6 +39,7 @@ from Cheetah.Template import Template
 import sipb_xen_database
 from sipb_xen_database import Machine, CDROM, ctx, connect, MachineAccess, Type, Autoinstall
 import validation
 import sipb_xen_database
 from sipb_xen_database import Machine, CDROM, ctx, connect, MachineAccess, Type, Autoinstall
 import validation

+import cache_acls

 from webcommon import InvalidInput, CodeError, g
 import controls
 
 from webcommon import InvalidInput, CodeError, g
 import controls
 

@@ -394,16 +395,21 @@ def modifyDict(user, fields):
                 disk.size = disksize
                 ctx.current.save(disk)
 
                 disk.size = disksize
                 ctx.current.save(disk)
 

-        if owner is not None:
+        update_acl = False
+        if owner is not None and owner != machine.owner:

             machine.owner = owner
             machine.owner = owner

+            update_acl = True

         if name is not None:
             machine.name = name
         if name is not None:
             machine.name = name

-        if admin is not None:
+        if admin is not None and admin != machine.administrator:

             machine.administrator = admin
             machine.administrator = admin

+            update_acl = True

         if contact is not None:
             machine.contact = contact
 
         ctx.current.save(machine)
         if contact is not None:
             machine.contact = contact
 
         ctx.current.save(machine)

+        if update_acl:
+            cache_acls.refreshMachine(machine)

         transaction.commit()
     except:
         transaction.rollback()
         transaction.commit()
     except:
         transaction.rollback()