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

Fixed bug with human filter description, refs #189

Browse source 
We were showing this:

    201 rows where sorted by sortable_with_nulls

We now show this:

    201 rows sorted by sortable_with_nulls
This commit is contained in:
Simon Willison 2018-04-08 22:07:18 -07:00 • committed by Simon Willison
commit c1d37fdf2b
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
datasette/templates/table.html
View file

@ -25,7 +25,7 @@
{% 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_description_en %}where {{ human_description_en }}{% endif %}
{% if human_description_en %}{{ human_description_en }}{% endif %}
</h3>
{% endif %}

5
datasette/utils.py
View file

@ -475,7 +475,10 @@ class Filters:
and_bits.append(', '.join(commas))
if tail:
and_bits.append(tail[0])
return ' and '.join(and_bits)
s = ' and '.join(and_bits)
if not s:
return ''
return 'where {}'.format(s)
def selections(self):
"Yields (column, lookup, value) tuples"

2
tests/test_api.py
View file

@ -388,6 +388,8 @@ def test_sortable_and_filtered(app_client):
)
response = app_client.get(path, gather_request=False)
fetched = response.json['rows']
assert 'where content contains "d" sorted by sortable descending' \
== response.json['human_description_en']
expected = [
row for row in generate_sortable_rows(201)
if 'd' in row['content']