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

Fixed internal links to respect db.route, refs #1668

Browse source
This commit is contained in:
Simon Willison 2022-03-19 17:31:23 -07:00
commit cdbae2b93f
3 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
datasette/url_builder.py
View file

@ -28,7 +28,8 @@ class Urls:
return self.path("-/logout")
def database(self, database, format=None):
return self.path(tilde_encode(database), format=format)
db = self.ds.get_database(database)
return self.path(tilde_encode(db.route), format=format)
def table(self, database, table, format=None):
path = f"{self.database(database)}/{tilde_encode(table)}"

5
datasette/views/table.py
View file

@ -141,10 +141,9 @@ class RowTableShared(DataView):
"is_special_link_column": is_special_link_column,
"raw": pk_path,
"value": markupsafe.Markup(
'<a href="{base_url}{database}/{table}/{flat_pks_quoted}">{flat_pks}</a>'.format(
'<a href="{table_path}/{flat_pks_quoted}">{flat_pks}</a>'.format(
base_url=base_url,
database=database,
table=tilde_encode(table),
table_path=self.ds.urls.table(database, table),
flat_pks=str(markupsafe.escape(pk_path)),
flat_pks_quoted=path_from_row_pks(row, pks, not pks),
)