Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

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

diff --git a/PLC/Methods/AddPerson.py b/PLC/Methods/AddPerson.py
index 63b3cf3..cb0aa71 100644 (file)
--- a/PLC/Methods/AddPerson.py
+++ b/PLC/Methods/AddPerson.py
@@ -2,7 +2,7 @@ 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 PasswordAuth
+from PLC.Auth import Auth
 
 can_update = lambda (field, value): field in \
              ['first_name', 'last_name', 'title',
@@ -14,7 +14,7 @@ class AddPerson(Method):
     used, otherwise defaults are used.
 
     Accounts are disabled by default. To enable an account, use
-    SetPersonEnabled() or UpdatePerson().
+    UpdatePerson().
 
     Returns the new person_id (> 0) if successful, faults otherwise.
     """
@@ -24,21 +24,20 @@ class AddPerson(Method):
     person_fields = dict(filter(can_update, Person.fields.items()))
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         person_fields
         ]
 
     returns = Parameter(int, 'New person_id (> 0) if successful')
 
-    event_type = 'Add'
-    object_type = 'Person'
-    object_ids = []
-
     def call(self, auth, person_fields):
         person_fields = dict(filter(can_update, person_fields.items()))
+        person_fields['enabled'] = False
         person = Person(self.api, person_fields)
         person.sync()
 
-       self.object_ids = [person['person_id']]
+       # Logging variables
+       self.event_objects = {'Person': [person['person_id']]}
+       self.message = 'Person %d added' % person['person_id']  
 
         return person['person_id']