git://git.onelab.eu
/
plcapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
750e80b
)
allow GetSlices to filter on tags as well
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Tue, 19 Aug 2014 13:04:49 +0000
(15:04 +0200)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Tue, 19 Aug 2014 13:04:49 +0000
(15:04 +0200)
PLC/Slices.py
patch
|
blob
|
history
diff --git
a/PLC/Slices.py
b/PLC/Slices.py
index
93ec562
..
7226857
100644
(file)
--- a/
PLC/Slices.py
+++ b/
PLC/Slices.py
@@
-281,7
+281,8
@@
class Slices(Table):
slice_filter = Filter(Slice.fields, {'slice_id': ints, 'name': strs})
sql += " AND (%s) %s" % slice_filter.sql(api, "OR")
elif isinstance(slice_filter, dict):
- slice_filter = Filter(Slice.fields, slice_filter)
+ allowed_fields=dict(Slice.fields.items()+Slice.tags.items())
+ slice_filter = Filter(allowed_fields, slice_filter)
sql += " AND (%s) %s" % slice_filter.sql(api, "AND")
elif isinstance (slice_filter, StringTypes):
slice_filter = Filter(Slice.fields, {'name':slice_filter})