X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FRoles.py;h=28fae356a1fd02bb50bdb681ee73d5d1dee3c8c7;hb=f7ce7ce813d4c44502629820a3583f32a99a98f7;hp=d85444fe3b508d18b598afb9d2e9e5c1df32b856;hpb=9a608e111c7f8182f51753ea3f563ebc19eb4c71;p=plcapi.git diff --git a/PLC/Roles.py b/PLC/Roles.py index d85444f..28fae35 100644 --- a/PLC/Roles.py +++ b/PLC/Roles.py @@ -29,24 +29,24 @@ class Role(Row): } def validate_role_id(self, role_id): - # Make sure role does not already exist - conflicts = Roles(self.api, [role_id]) + # Make sure role does not already exist + conflicts = Roles(self.api, [role_id]) if conflicts: raise PLCInvalidArgument, "Role ID already in use" return role_id def validate_name(self, name): - # Make sure name is not blank + # Make sure name is not blank if not len(name): raise PLCInvalidArgument, "Role must be specified" - - # Make sure role does not already exist - conflicts = Roles(self.api, [name]) + + # Make sure role does not already exist + conflicts = Roles(self.api, [name]) if conflicts: raise PLCInvalidArgument, "Role name already in use" - return name + return name class Roles(Table): """ @@ -58,7 +58,7 @@ class Roles(Table): sql = "SELECT %s FROM roles WHERE True" % \ ", ".join(Role.fields) - + if role_filter is not None: if isinstance(role_filter, (list, tuple, set)): # Separate the list into integers and strings