Skip to content

Commit

Permalink
Updated settings help URL to avoid redirect
Browse files Browse the repository at this point in the history
  • Loading branch information
simonw committed Jan 14, 2022
1 parent 714b4df commit ab7d6a7
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion datasette/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ def uninstall(packages, yes):
"--setting",
"settings",
type=Setting(),
help="Setting, see docs.datasette.io/en/stable/config.html",
help="Setting, see docs.datasette.io/en/stable/settings.html",
multiple=True,
)
@click.option(
Expand Down
2 changes: 1 addition & 1 deletion datasette/views/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ async def view_get(self, request, database, hash, correct_hash_provided, **kwarg
raise DatasetteError(
"""
SQL query took too long. The time limit is controlled by the
<a href="https://docs.datasette.io/en/stable/config.html#sql-time-limit-ms">sql_time_limit_ms</a>
<a href="https://docs.datasette.io/en/stable/settings.html#sql-time-limit-ms">sql_time_limit_ms</a>
configuration option.
""",
title="SQL Interrupted",
Expand Down
3 changes: 2 additions & 1 deletion docs/cli-reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ datasette serve --help
--memory Make /_memory database available
--config CONFIG Deprecated: set config option using
configname:value. Use --setting instead.
--setting SETTING... Setting, see docs.datasette.io/en/stable/config.html
--setting SETTING... Setting, see
docs.datasette.io/en/stable/settings.html
--secret TEXT Secret used for signing secure values, such as
signed cookies
--root Output URL that sets a cookie authenticating the
Expand Down
2 changes: 1 addition & 1 deletion tests/test_html.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def test_sql_time_limit(app_client_shorter_time_limit):
response = app_client_shorter_time_limit.get("/fixtures?sql=select+sleep(0.5)")
assert 400 == response.status
expected_html_fragment = """
<a href="https://docs.datasette.io/en/stable/config.html#sql-time-limit-ms">sql_time_limit_ms</a>
<a href="https://docs.datasette.io/en/stable/settings.html#sql-time-limit-ms">sql_time_limit_ms</a>
""".strip()
assert expected_html_fragment in response.text

Expand Down

0 comments on commit ab7d6a7

Please sign in to comment.