X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FPersonTags.py;h=a0f8333214f1c986bdec868e6c8100ef40f55a63;hb=1b1b5a911bb005644baabb87ecba60602228a070;hp=fb9acc055f82779761ab04839f013ae862f3dd6c;hpb=f7ce7ce813d4c44502629820a3583f32a99a98f7;p=plcapi.git diff --git a/PLC/PersonTags.py b/PLC/PersonTags.py index fb9acc0..a0f8333 100644 --- a/PLC/PersonTags.py +++ b/PLC/PersonTags.py @@ -1,5 +1,3 @@ -# $Id$ -# $URL$ # # Thierry Parmentelat - INRIA # @@ -26,7 +24,6 @@ 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 @@ -45,14 +42,12 @@ 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)): 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 + raise PLCInvalidArgument("Wrong person setting filter %r"%person_tag_filter) sql += " AND (%s) %s" % person_tag_filter.sql(api)