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

Columns in filters now ignore ?_nocol, closes #1503

Browse source
This commit is contained in:
Simon Willison 2021-11-13 20:53:00 -08:00
commit c9e3cfecc8
2 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
datasette/views/table.py
View file

@ -922,7 +922,7 @@ class TableView(RowTableShared):
"use_rowid": use_rowid, "use_rowid": use_rowid,
"filters": filters, "filters": filters,
"display_columns": display_columns, "display_columns": display_columns,
"filter_columns": columns, "filter_columns": table_columns,
"display_rows": display_rows, "display_rows": display_rows,
"facets_timed_out": facets_timed_out, "facets_timed_out": facets_timed_out,
"sorted_facet_results": sorted( "sorted_facet_results": sorted(

20
tests/test_html.py
View file

@ -923,6 +923,26 @@ def test_table_html_filter_form_column_options(
assert expected_column_options == column_options assert expected_column_options == column_options
def test_table_html_filter_form_still_shows_nocol_columns(app_client):
# https://github.com/simonw/datasette/issues/1503
response = app_client.get("/fixtures/sortable?_nocol=sortable")
assert response.status == 200
form = Soup(response.body, "html.parser").find("form")
assert [
o.string
for o in form.select("select[name='_filter_column']")[0].select("option")
] == [
"- column -",
"pk1",
"pk2",
"content",
"sortable",
"sortable_with_nulls",
"sortable_with_nulls_2",
"text",
]
def test_row_html_compound_primary_key(app_client): def test_row_html_compound_primary_key(app_client):
response = app_client.get("/fixtures/compound_primary_key/a,b") response = app_client.get("/fixtures/compound_primary_key/a,b")
assert response.status == 200 assert response.status == 200