merge changes from head

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

diff --git a/PLC/Methods/AdmGetPersonSites.py b/PLC/Methods/AdmGetPersonSites.py
index 78b5e02..79324f8 100644 (file)
--- a/PLC/Methods/AdmGetPersonSites.py
+++ b/PLC/Methods/AdmGetPersonSites.py
@@ -3,7 +3,7 @@ from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Persons import Person, Persons
 from PLC.Sites import Site, Sites
 from PLC.Parameter import Parameter, Mixed
 from PLC.Persons import Person, Persons
 from PLC.Sites import Site, Sites

-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth

 
 class AdmGetPersonSites(Method):
     """
 
 class AdmGetPersonSites(Method):
     """


@@ -17,8 +17,12 @@ class AdmGetPersonSites(Method):
     themselves and others at their sites.
     """
 
     themselves and others at their sites.
     """
 

+    status = "deprecated"
+
+    roles = ['admin', 'pi', 'user', 'tech']
+

     accepts = [
     accepts = [

-        PasswordAuth(),
+        Auth(),

         Mixed(Person.fields['person_id'],
               Person.fields['email'])
         ]
         Mixed(Person.fields['person_id'],
               Person.fields['email'])
         ]


@@ -31,7 +35,7 @@ class AdmGetPersonSites(Method):
         if not persons:
             raise PLCInvalidArgument, "No such account"
 
         if not persons:
             raise PLCInvalidArgument, "No such account"
 

-        person = persons.values()[0]
+        person = persons[0]

 
         # Authenticated function
         assert self.caller is not None
 
         # Authenticated function
         assert self.caller is not None