github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Support multiple filters of the same type

Browse source 
Closes #288
This commit is contained in:
Simon Willison 2019-04-15 16:44:17 -07:00
commit 9c77e6e355
3 changed files with 63 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

9
datasette/views/table.py
View file

@ -219,13 +219,14 @@ class TableView(RowTableShared):
# it can still be queried using ?_col__exact=blah
special_args = {}
special_args_lists = {}
other_args = {}
other_args = []
for key, value in args.items():
if key.startswith("_") and "__" not in key:
special_args[key] = value[0]
special_args_lists[key] = value
else:
other_args[key] = value[0]
for v in value:
other_args.append((key, v))
# Handle ?_filter_column and redirect, if present
redirect_params = filters_should_redirect(special_args)
@ -253,7 +254,7 @@ class TableView(RowTableShared):
table_metadata = self.ds.table_metadata(database, table)
units = table_metadata.get("units", {})
filters = Filters(sorted(other_args.items()), units, ureg)
filters = Filters(sorted(other_args), units, ureg)
where_clauses, params = filters.build_where_clauses(table)
extra_wheres_for_ui = []
@ -521,7 +522,7 @@ class TableView(RowTableShared):
database, table, column, values
))
for row in facet_rows:
selected = str(other_args.get(column)) == str(row["value"])
selected = (column, str(row["value"])) in other_args
if selected:
toggle_path = path_with_removed_args(
request, {column: str(row["value"])}