X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FPersonTags.py;h=9327abf325a54ae4e96856c9d5324bf5ac5a2f9c;hb=da06561d0f5240a5409474e16824e4e015f31fac;hp=d3c788ade6b8103bc0061091439db1d69677e642;hpb=1a0fd7b1835cc3e5f97a58edb544396fd2ba2dff;p=plcapi.git diff --git a/PLC/PersonTags.py b/PLC/PersonTags.py index d3c788a..9327abf 100644 --- a/PLC/PersonTags.py +++ b/PLC/PersonTags.py @@ -1,5 +1,3 @@ -# $Id$ -# $URL$ # # Thierry Parmentelat - INRIA # @@ -26,10 +24,9 @@ class PersonTag(Row): 'tagname': TagType.fields['tagname'], 'description': TagType.fields['description'], 'category': TagType.fields['category'], - 'min_role_id': TagType.fields['min_role_id'], 'value': Parameter(str, "Person setting value"), - ### relations - + ### relations + } class PersonTags(Table): @@ -45,12 +42,10 @@ class PersonTags(Table): ", ".join(self.columns) if person_tag_filter is not None: - if isinstance(person_tag_filter, (list, tuple, set)): + if isinstance(person_tag_filter, (list, tuple, set, int, long)): person_tag_filter = Filter(PersonTag.fields, {'person_tag_id': person_tag_filter}) elif isinstance(person_tag_filter, dict): person_tag_filter = Filter(PersonTag.fields, person_tag_filter) - elif isinstance(person_tag_filter, int): - person_tag_filter = Filter(PersonTag.fields, {'person_tag_id': [person_tag_filter]}) else: raise PLCInvalidArgument, "Wrong person setting filter %r"%person_tag_filter sql += " AND (%s) %s" % person_tag_filter.sql(api)