X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FAddresses.py;h=6c095ccee1127b2502952f2168a80d0f067d20f3;hb=1d3540bd2ece27d91a2ec5843628c5fa38a25024;hp=62f9e3bd3dddad66476814936f6f01373a5ad22f;hpb=e347fc823bbba9d88a3fddf07d5c21024dfd1e55;p=plcapi.git diff --git a/PLC/Addresses.py b/PLC/Addresses.py index 62f9e3b..6c095cc 100644 --- a/PLC/Addresses.py +++ b/PLC/Addresses.py @@ -84,16 +84,16 @@ class Addresses(Table): """ def __init__(self, api, address_filter = None, columns = None): - Table.__init__(self, api, Address, columns) + Table.__init__(self, api, Address, columns) sql = "SELECT %s FROM view_addresses WHERE True" % \ ", ".join(self.columns) if address_filter is not None: - if isinstance(address_filter, (list, tuple, set)): + if isinstance(address_filter, (list, tuple, set, int)): address_filter = Filter(Address.fields, {'address_id': address_filter}) elif isinstance(address_filter, dict): address_filter = Filter(Address.fields, address_filter) - sql += " AND (%s)" % address_filter.sql(api) + sql += " AND (%s) %s" % address_filter.sql(api) self.selectall(sql)