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

Fix more broken base_url links

Browse source 
Refs #1519, #838
This commit is contained in:
Simon Willison 2021-11-20 11:03:08 -08:00
commit 08947fa764
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
datasette/facets.py
View file

@ -225,8 +225,8 @@ class ColumnFacet(Facet):
"name": column, "name": column,
"type": self.type, "type": self.type,
"hideable": source != "metadata", "hideable": source != "metadata",
"toggle_url": path_with_removed_args( "toggle_url": ds.urls.path(
self.request, {"_facet": column} path_with_removed_args(self.request, {"_facet": column})
), ),
"results": facet_results_values, "results": facet_results_values,
"truncated": len(facet_rows_results) > facet_size, "truncated": len(facet_rows_results) > facet_size,
@ -259,7 +259,7 @@ class ColumnFacet(Facet):
"label": expanded.get((column, row["value"]), row["value"]), "label": expanded.get((column, row["value"]), row["value"]),
"count": row["count"], "count": row["count"],
"toggle_url": self.ds.absolute_url( "toggle_url": self.ds.absolute_url(
self.request, toggle_path self.request, self.ds.urls.path(toggle_path)
), ),
"selected": selected, "selected": selected,
} }
@ -397,8 +397,8 @@ class ArrayFacet(Facet):
"type": self.type, "type": self.type,
"results": facet_results_values, "results": facet_results_values,
"hideable": source != "metadata", "hideable": source != "metadata",
"toggle_url": path_with_removed_args( "toggle_url": self.ds.urls.path(
self.request, {"_facet_array": column} path_with_removed_args(self.request, {"_facet_array": column})
), ),
"truncated": len(facet_rows_results) > facet_size, "truncated": len(facet_rows_results) > facet_size,
} }

2
datasette/views/table.py
View file

@ -839,7 +839,7 @@ class TableView(RowTableShared):
else: else:
added_args = {"_next": next_value} added_args = {"_next": next_value}
next_url = self.ds.absolute_url( next_url = self.ds.absolute_url(
request, path_with_replaced_args(request, added_args) request, self.ds.urls.path(path_with_replaced_args(request, added_args))
) )
rows = rows[:page_size] rows = rows[:page_size]

1
tests/test_html.py
View file

@ -1614,6 +1614,7 @@ def test_metadata_sort_desc(app_client):
"/fixtures/compound_three_primary_keys/a,a,a", "/fixtures/compound_three_primary_keys/a,a,a",
"/fixtures/paginated_view", "/fixtures/paginated_view",
"/fixtures/facetable", "/fixtures/facetable",
"/fixtures/facetable?_facet=state",
"/fixtures?sql=select+1", "/fixtures?sql=select+1",
], ],
) )