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

Search now applies to current filters

Browse source 
Combined search into the same form as filters.

Closes #133
This commit is contained in:
Simon Willison 2017-11-24 14:22:57 -08:00
commit a802cbee74
No known key found for this signature in database
GPG key ID: FBB38AFE227189DB
5 changed files with 42 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
datasette/app.py
View file

@ -528,12 +528,14 @@ class TableView(RowTableShared):
fts_table = fts_rows[0][0]
search = special_args.get('_search')
search_description = None
if search and fts_table:
where_clauses.append(
'rowid in (select rowid from [{fts_table}] where [{fts_table}] match :search)'.format(
fts_table=fts_table
)
)
search_description = 'search matches "{}"'.format(search)
params['search'] = search
next = special_args.get('_next')
@ -642,10 +644,13 @@ class TableView(RowTableShared):
# Almost certainly hit the timeout
pass
# human_filter_description combines filters AND search, if provided
human_description = filters.human_description(extra=search_description)
async def extra_template():
return {
'database_hash': hash,
'human_filter_description': filters.human_description(),
'human_filter_description': human_description,
'supports_search': bool(fts_table),
'search': search or '',
'use_rowid': use_rowid,