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

Current sort order now reflected in human filter description

Browse source 
Plus renamed human_description to human_description_en

Refs #189
This commit is contained in:
Simon Willison 2018-04-08 18:01:23 -07:00 • committed by Simon Willison
commit 9f2ec39fbc
4 changed files with 41 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
datasette/app.py
View file

@ -773,8 +773,17 @@ 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)
# human_description_en combines filters AND search, if provided
human_description_en = filters.human_description_en(extra=search_description)
if sort or sort_desc:
sorted_by = 'sorted by {}{}'.format(
(sort or sort_desc),
' descending' if sort_desc else '',
)
human_description_en = ' '.join([
b for b in [human_description_en, sorted_by] if b
])
async def extra_template():
display_columns, display_rows = await self.display_columns_and_rows(
@ -786,7 +795,6 @@ class TableView(RowTableShared):
self.ds.update_with_inherited_metadata(metadata)
return {
'database_hash': hash,
'human_filter_description': human_description,
'supports_search': bool(fts_table),
'search': search or '',
'use_rowid': use_rowid,
@ -808,6 +816,7 @@ class TableView(RowTableShared):
'is_view': is_view,
'view_definition': view_definition,
'table_definition': table_definition,
'human_description_en': human_description_en,
'rows': rows[:self.page_size],
'truncated': truncated,
'table_rows': table_rows,

6
datasette/templates/table.html
View file

@ -1,7 +1,7 @@
{% extends "base.html" %}
{% block title %}{{ database }}: {{ table }}: {% if filtered_table_rows or filtered_table_rows == 0 %}{{ "{:,}".format(filtered_table_rows) }} row{% if filtered_table_rows == 1 %}{% else %}s{% endif %}{% endif %}
{% if human_filter_description %}where {{ human_filter_description }}{% endif %}{% endblock %}
{% if human_description_en %}where {{ human_description_en }}{% endif %}{% endblock %}
{% block extra_head %}
{{ super() }}
@ -23,9 +23,9 @@
{% block description_source_license %}{% include "_description_source_license.html" %}{% endblock %}
{% if filtered_table_rows or human_filter_description %}
{% if filtered_table_rows or human_description_en %}
<h3>{% if filtered_table_rows or filtered_table_rows == 0 %}{{ "{:,}".format(filtered_table_rows) }} row{% if filtered_table_rows == 1 %}{% else %}s{% endif %}{% endif %}
{% if human_filter_description %}where {{ human_filter_description }}{% endif %}
{% if human_description_en %}where {{ human_description_en }}{% endif %}
</h3>
{% endif %}

2
datasette/utils.py
View file

@ -460,7 +460,7 @@ class Filters:
for filter in self._filters:
yield filter.key, filter.display, filter.no_argument
def human_description(self, extra=None):
def human_description_en(self, extra=None):
bits = []
if extra:
bits.append(extra)