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

Refactored alternate_url_json mechanism, refs #1620, #1533

Browse source
This commit is contained in:
Simon Willison 2022-02-02 13:32:47 -08:00
commit 8d5779acf0
10 changed files with 27 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

20
datasette/views/table.py
View file

@ -851,12 +851,7 @@ class TableView(RowTableShared):
for table_column in table_columns
if table_column not in columns
]
alternate_url_json = self.ds.absolute_url(
request,
self.ds.urls.path(path_with_format(request=request, format="json")),
)
d = {
"alternate_url_json": alternate_url_json,
"table_actions": table_actions,
"use_rowid": use_rowid,
"filters": filters,
@ -887,11 +882,6 @@ class TableView(RowTableShared):
"metadata": metadata,
"view_definition": await db.get_view_definition(table),
"table_definition": await db.get_table_definition(table),
"_extra_headers": {
"Link": '{}; rel="alternate"; type="application/json+datasette"'.format(
alternate_url_json
)
},
}
d.update(extra_context_from_filters)
return d
@ -975,12 +965,7 @@ class RowView(RowTableShared):
)
for column in display_columns:
column["sortable"] = False
alternate_url_json = self.ds.absolute_url(
request,
self.ds.urls.path(path_with_format(request=request, format="json")),
)
return {
"alternate_url_json": alternate_url_json,
"foreign_key_tables": await self.foreign_key_tables(
database, table, pk_values
),
@ -995,11 +980,6 @@ class RowView(RowTableShared):
.get(database, {})
.get("tables", {})
.get(table, {}),
"_extra_headers": {
"Link": '{}; rel="alternate"; type="application/json+datasette"'.format(
alternate_url_json
)
},
}
data = {