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

Correct escaping for HTML display of row links

Browse source
This commit is contained in:
Russ Garrett 2018-04-15 22:48:30 +01:00 • committed by Simon Willison
commit b231d4243d
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
datasette/utils.py
View file

@ -38,14 +38,19 @@ def urlsafe_components(token):
]
def path_from_row_pks(row, pks, use_rowid):
def path_from_row_pks(row, pks, use_rowid, quote=True):
""" Generate an optionally URL-quoted unique identifier
for a row from its primary keys."""
if use_rowid:
return urllib.parse.quote_plus(str(row['rowid']))
bits = []
for pk in pks:
bits.append(
urllib.parse.quote_plus(str(row[pk]))
)
bits = [row['rowid']]
else:
bits = [row[pk] for pk in pks]
if quote:
bits = [urllib.parse.quote_plus(str(bit)) for bit in bits]
else:
bits = [str(bit) for bit in bits]
return ','.join(bits)