remote/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2026-06-14 21:16:56 +02:00
Code Issues Projects Releases Packages Wiki Activity

Default to _labels=on on JSON/CSV links with foreign keys, refs #266

Browse source
This commit is contained in:
Simon Willison 2018-06-17 15:56:55 -07:00
commit 0d7ba1ba67
No known key found for this signature in database
GPG key ID: 17E2DEA2588B7F52
3 changed files with 34 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
datasette/views/table.py
View file

@ -573,7 +573,7 @@ class TableView(RowTableShared):
filter_columns = filter_columns[1:]
# Expand labeled columns if requested
columns_expanded = []
expanded_columns = []
expandable_columns = self.expandable_columns(name, table)
columns_to_expand = None
try:
@ -595,7 +595,7 @@ class TableView(RowTableShared):
column = fk["column"]
if column not in columns_to_expand:
continue
columns_expanded.append(column)
expanded_columns.append(column)
# Gather the values
column_index = columns.index(column)
values = [row[column_index] for row in rows]
@ -771,7 +771,8 @@ class TableView(RowTableShared):
"truncated": results.truncated,
"table_rows_count": table_rows_count,
"filtered_table_rows_count": filtered_table_rows_count,
"columns_expanded": columns_expanded,
"expanded_columns": expanded_columns,
"expandable_columns": expandable_columns,
"columns": columns,
"primary_keys": pks,
"units": units,