X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FSiteTags.py;h=a03ac24a9185019c5307b761183b659a2f664d8a;hb=c3fc031363ac794e6b1245c6ed1a05329cba69c9;hp=c70a46c7055b16b0936489878ce476e9fe59d3dd;hpb=00b458601d8f318b617b43d11cb4fdb93e89967c;p=plcapi.git diff --git a/PLC/SiteTags.py b/PLC/SiteTags.py index c70a46c..a03ac24 100644 --- a/PLC/SiteTags.py +++ b/PLC/SiteTags.py @@ -1,5 +1,3 @@ -# $Id$ -# $URL$ # # Thierry Parmentelat - INRIA # @@ -26,7 +24,6 @@ class SiteTag(Row): 'tagname': TagType.fields['tagname'], 'description': TagType.fields['description'], 'category': TagType.fields['category'], - 'min_role_id': TagType.fields['min_role_id'], 'value': Parameter(str, "Site setting value"), ### relations @@ -45,12 +42,12 @@ class SiteTags(Table): ", ".join(self.columns) if site_tag_filter is not None: - if isinstance(site_tag_filter, (list, tuple, set, int, long)): + if isinstance(site_tag_filter, (list, tuple, set, int)): site_tag_filter = Filter(SiteTag.fields, {'site_tag_id': site_tag_filter}) elif isinstance(site_tag_filter, dict): site_tag_filter = Filter(SiteTag.fields, site_tag_filter) else: - raise PLCInvalidArgument, "Wrong site setting filter %r"%site_tag_filter + raise PLCInvalidArgument("Wrong site setting filter %r"%site_tag_filter) sql += " AND (%s) %s" % site_tag_filter.sql(api)