mirror
/
datasette
kopia lustrzana https://github.com/simonw/datasette
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix pagination when sorted by expanded foreign key 

Closes #489
pull/497/head
Simon Willison 2019-05-27 19:23:18 -07:00
rodzic f069950a14
commit 9c58d048ec
2 zmienionych plików z 4 dodań i 0 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
datasette/views/table.py
Wyświetl plik

@ -629,6 +629,8 @@ class TableView(RowTableShared):
# If there's a sort or sort_desc, add that value as a prefix # If there's a sort or sort_desc, add that value as a prefix
if (sort or sort_desc) and not is_view: if (sort or sort_desc) and not is_view:
prefix = rows[-2][sort or sort_desc] prefix = rows[-2][sort or sort_desc]
if isinstance(prefix, dict) and "value" in prefix:
prefix = prefix["value"]
if prefix is None: if prefix is None:
prefix = "$null" prefix = "$null"
else: else:

2
tests/test_api.py
Wyświetl plik

@ -753,6 +753,8 @@ def test_table_with_reserved_word_name(app_client):
("/fixtures/123_starts_with_digits.json", 0, 1), ("/fixtures/123_starts_with_digits.json", 0, 1),
# Ensure faceting doesn't break pagination: # Ensure faceting doesn't break pagination:
("/fixtures/compound_three_primary_keys.json?_facet=pk1", 1001, 21), ("/fixtures/compound_three_primary_keys.json?_facet=pk1", 1001, 21),
# Paginating while sorted by an expanded foreign key should work
("/fixtures/roadside_attraction_characteristics.json?_size=2&_sort=attraction_id&_labels=on", 5, 3),
], ],
) )
def test_paginate_tables_and_views(app_client, path, expected_rows, expected_pages): def test_paginate_tables_and_views(app_client, path, expected_rows, expected_pages):