X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FSliceAttributeTypes.py;fp=PLC%2FSliceAttributeTypes.py;h=5884fe0a11f399d07bf7efd6af69dda669189299;hb=a0e131a2893c75df786c94997370b01cb623dee0;hp=6aa4baa280195169b4fa64cacd0d487908f6e7e6;hpb=5a4c1b1278ffa01e630fde47f7c54888ed20a576;p=plcapi.git diff --git a/PLC/SliceAttributeTypes.py b/PLC/SliceAttributeTypes.py index 6aa4baa..5884fe0 100644 --- a/PLC/SliceAttributeTypes.py +++ b/PLC/SliceAttributeTypes.py @@ -64,9 +64,9 @@ class SliceAttributeTypes(Table): ints = filter(lambda x: isinstance(x, (int, long)), attribute_type_filter) strs = filter(lambda x: isinstance(x, StringTypes), attribute_type_filter) attribute_type_filter = Filter(SliceAttributeType.fields, {'attribute_type_id': ints, 'name': strs}) - sql += " AND (%s)" % attribute_type_filter.sql(api, "OR") + sql += " AND (%s) %s" % attribute_type_filter.sql(api, "OR") elif isinstance(attribute_type_filter, dict): attribute_type_filter = Filter(SliceAttributeType.fields, attribute_type_filter) - sql += " AND (%s)" % attribute_type_filter.sql(api, "AND") + sql += " AND (%s) %s" % attribute_type_filter.sql(api, "AND") self.selectall(sql)