svn keywords

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

diff --git a/PLC/Methods/AddPerson.py b/PLC/Methods/AddPerson.py
index d80826b..99f634c 100644 (file)
--- a/PLC/Methods/AddPerson.py
+++ b/PLC/Methods/AddPerson.py
@@ -1,11 +1,14 @@
+# $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 PasswordAuth
+from PLC.Auth import Auth
 
 can_update = lambda (field, value): field in \
-             ['title', 'email', 'password', 'phone', 'url', 'bio']
+             ['first_name', 'last_name', 'title',
+              'email', 'password', 'phone', 'url', 'bio']
 
 class AddPerson(Method):
     """
@@ -13,30 +16,30 @@ 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.
     """
 
     roles = ['admin', 'pi']
 
-    update_fields = dict(filter(can_update, Person.fields.items()))
+    person_fields = dict(filter(can_update, Person.fields.items()))
 
     accepts = [
-        PasswordAuth(),
-        Person.fields['first_name'],
-        Person.fields['last_name'],
-        update_fields
+        Auth(),
+        person_fields
         ]
 
     returns = Parameter(int, 'New person_id (> 0) if successful')
 
-    def call(self, auth, first_name, last_name, person_fields = {}):
+    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['first_name'] = first_name
-        person['last_name'] = last_name
-        person['enabled'] = False
         person.sync()
 
+       # Logging variables
+       self.event_objects = {'Person': [person['person_id']]}
+       self.message = 'Person %d added' % person['person_id']  
+
         return person['person_id']