fix roles interface

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

diff --git a/PLC/Methods/AdmRevokeRoleFromPerson.py b/PLC/Methods/AdmRevokeRoleFromPerson.py
index 61dbda5..cb7c2df 100644 (file)
--- a/PLC/Methods/AdmRevokeRoleFromPerson.py
+++ b/PLC/Methods/AdmRevokeRoleFromPerson.py
@@ -21,16 +21,26 @@ class AdmRevokeRoleFromPerson(Method):
         PasswordAuth(),
         Mixed(Person.fields['person_id'],
               Person.fields['email']),
-        Parameter(int, 'Role ID')
+        Mixed(Parameter(int, "Role identifier"),
+              Parameter(str, "Role name"))
         ]
 
     returns = Parameter(int, '1 if successful')
 
-    def call(self, auth, person_id_or_email, role_id):
+    def call(self, auth, person_id_or_email, role_id_or_name):
         # Get all roles
-        roles = Roles(self.api)
-        if role_id not in roles:
-            raise PLCInvalidArgument, "Invalid role ID"
+        roles = {}
+        for role_id, role in Roles(self.api).iteritems():
+            roles[role_id] = role['name']
+            roles[role['name']] = role_id
+
+        if role_id_or_name not in roles:
+            raise PLCInvalidArgument, "Invalid role identifier or name"
+
+        if isinstance(role_id_or_name, int):
+            role_id = role_id_or_name
+        else:
+            role_id = roles[role_id_or_name]
 
         # Get account information
         persons = Persons(self.api, [person_id_or_email])