- Change .py files to use 4-space indents and no hard tab characters.

[plcapi.git] / PLC / Methods / UpdateSite.py

diff --git a/PLC/Methods/UpdateSite.py b/PLC/Methods/UpdateSite.py
index 2e4d95d..8a47cd3 100644 (file)
--- a/PLC/Methods/UpdateSite.py
+++ b/PLC/Methods/UpdateSite.py
@@ -1,20 +1,24 @@
+# $Id$
+# $URL$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Sites import Site, Sites
 from PLC.Auth import Auth
 
+related_fields = Site.related_fields.keys()
 can_update = lambda (field, value): field in \
              ['name', 'abbreviated_name', 'login_base',
               'is_public', 'latitude', 'longitude', 'url',
-              'max_slices', 'max_slivers', 'enabled', 'ext_consortium_id']
+              'max_slices', 'max_slivers', 'enabled', 'ext_consortium_id'] + \
+              related_fields
 
 class UpdateSite(Method):
     """
     Updates a site. Only the fields specified in update_fields are
     updated, all other fields are left untouched.
 
-    PIs can only update sites they are a member of. Only admins can 
+    PIs can only update sites they are a member of. Only admins can
     update max_slices, max_slivers, and login_base.
 
     Returns 1 if successful, faults otherwise.
@@ -22,7 +26,7 @@ class UpdateSite(Method):
 
     roles = ['admin', 'pi']
 
-    site_fields = dict(filter(can_update, Site.fields.items()))
+    site_fields = dict(filter(can_update, Site.fields.items() + Site.related_fields.items()))
 
     accepts = [
         Auth(),
@@ -59,12 +63,19 @@ class UpdateSite(Method):
                 if key in site_fields:
                     del site_fields[key]
 
+        # Make requested associations
+        for field in related_fields:
+            if field in site_fields:
+                site.associate(auth, field, site_fields[field])
+                site_fields.pop(field)
+
         site.update(site_fields)
-       site.sync()
-       
-       # Logging variables
-       self.event_objects = {'Site': [site['site_id']]}
-       self.message = 'Site %d updated: %s' % \
-               (site['site_id'], ", ".join(site_fields.keys()))        
-       
-       return 1
+        site.update_last_updated(False)
+        site.sync()
+
+        # Logging variables
+        self.event_objects = {'Site': [site['site_id']]}
+        self.message = 'Site %d updated: %s' % \
+                (site['site_id'], ", ".join(site_fields.keys()))
+
+        return 1