X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FUpdatePerson.py;h=0795151020bcf3583bf28c1541ac6fbe4285e4a7;hb=7ff3079ce042525acbf00e0d4fe555e8988c128d;hp=594f1ff6172c749fda0fae3a5dccabefbbed60d0;hpb=238d5594712b9d918636501e754a8f5816313e25;p=plcapi.git

diff --git a/PLC/Methods/UpdatePerson.py b/PLC/Methods/UpdatePerson.py
index 594f1ff..0795151 100644
--- a/PLC/Methods/UpdatePerson.py
+++ b/PLC/Methods/UpdatePerson.py
@@ -1,19 +1,23 @@
+# $Id$
+# $URL$
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Persons import Person, Persons
 from PLC.Auth import Auth
+from PLC.sendmail import sendmail
 
+related_fields = Person.related_fields.keys()
 can_update = lambda (field, value): field in \
              ['first_name', 'last_name', 'title', 'email',
               'password', 'phone', 'url', 'bio', 'accepted_aup',
-              'enabled']
+              'enabled'] + related_fields
 
 class UpdatePerson(Method):
     """
     Updates a person. Only the fields specified in person_fields are
     updated, all other fields are left untouched.
-    
+
     Users and techs can only update themselves. PIs can only update
     themselves and other non-PIs at their sites.
 
@@ -22,7 +26,7 @@ class UpdatePerson(Method):
 
     roles = ['admin', 'pi', 'user', 'tech']
 
-    person_fields = dict(filter(can_update, Person.fields.items()))
+    person_fields = dict(filter(can_update, Person.fields.items() + Person.related_fields.items()))
 
     accepts = [
         Auth(),
@@ -33,8 +37,6 @@ class UpdatePerson(Method):
 
     returns = Parameter(int, '1 if successful')
 
-    object_type = 'Person'
-
     def call(self, auth, person_id_or_email, person_fields):
         person_fields = dict(filter(can_update, person_fields.items()))
 
@@ -54,18 +56,37 @@ class UpdatePerson(Method):
         if not self.caller.can_update(person):
             raise PLCPermissionDenied, "Not allowed to update specified account"
 
+        # Make requested associations
+        for field in related_fields:
+            if field in person_fields:
+                person.associate(auth, field, person_fields[field])
+                person_fields.pop(field)
+
         person.update(person_fields)
+        person.update_last_updated(False)
         person.sync()
-	
-	# Logging variables
-	self.object_ids = [person['person_id']]
+
+        if 'enabled' in person_fields:
+            To = [("%s %s" % (person['first_name'], person['last_name']), person['email'])]
+            Cc = []
+            if person['enabled']:
+                Subject = "%s account enabled" % (self.api.config.PLC_NAME)
+                Body = "Your %s account has been enabled. Please visit %s to access your account." % (self.api.config.PLC_NAME, self.api.config.PLC_WWW_HOST)
+            else:
+                Subject = "%s account disabled" % (self.api.config.PLC_NAME)
+                Body = "Your %s account has been disabled. Please contact your PI or PlanetLab support for more information" % (self.api.config.PLC_NAME)
+            sendmail(self.api, To = To, Cc = Cc, Subject = Subject, Body = Body)
+
+
+        # Logging variables
+        self.event_objects = {'Person': [person['person_id']]}
 
         # Redact password
         if 'password' in person_fields:
             person_fields['password'] = "Removed by API"
         self.message = 'Person %d updated: %s.' % \
                        (person['person_id'], person_fields.keys())
-	if 'enabled' in person_fields:
-            self.message += ' Person enabled' 	
+        if 'enabled' in person_fields:
+            self.message += ' Person enabled'
 
         return 1