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

Refactored filter logic and added human descriptions - refs #86

Browse source
This commit is contained in:
Simon Willison 2017-11-19 22:03:24 -08:00
commit b4e6211a97
No known key found for this signature in database
GPG key ID: FBB38AFE227189DB
4 changed files with 108 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

10
datasette/app.py
View file

@ -16,7 +16,7 @@ import jinja2
import hashlib
import time
from .utils import (
build_where_clauses,
Filters,
compound_pks_from_path,
CustomJSONEncoder,
detect_fts_sql,
@ -440,11 +440,8 @@ class TableView(BaseView):
'_filter_value': None,
}))
if other_args:
where_clauses, params = build_where_clauses(other_args)
else:
where_clauses = []
params = {}
filters = Filters(sorted(other_args.items()))
where_clauses, params = filters.build_where_clauses()
# _search support:
fts_table = None
@ -539,6 +536,7 @@ class TableView(BaseView):
async def extra_template():
return {
'database_hash': hash,
'human_filter_description': filters.human_description(),
'supports_search': bool(fts_table),
'search': search or '',
'use_rowid': use_rowid,