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

Better breadcrumbs on database and table page, closes #2454

Browse source
This commit is contained in:
Simon Willison 2025-01-09 10:07:03 -08:00
commit 37873e02b0
3 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
datasette/templates/database.html
View file

@ -9,6 +9,10 @@
{% block body_class %}db db-{{ database|to_css_class }}{% endblock %} {% block body_class %}db db-{{ database|to_css_class }}{% endblock %}
{% block crumbs %}
{{ crumbs.nav(request=request, database=database) }}
{% endblock %}
{% block content %} {% block content %}
<div class="page-header" style="border-color: #{{ database_color }}"> <div class="page-header" style="border-color: #{{ database_color }}">
<h1>{{ metadata.title or database }}{% if private %} 🔒{% endif %}</h1> <h1>{{ metadata.title or database }}{% if private %} 🔒{% endif %}</h1>

2
datasette/templates/table.html
View file

@ -17,7 +17,7 @@
{% block body_class %}table db-{{ database|to_css_class }} table-{{ table|to_css_class }}{% endblock %} {% block body_class %}table db-{{ database|to_css_class }} table-{{ table|to_css_class }}{% endblock %}
{% block crumbs %} {% block crumbs %}
{{ crumbs.nav(request=request, database=database) }} {{ crumbs.nav(request=request, database=database, table=table) }}
{% endblock %} {% endblock %}
{% block content %} {% block content %}

19
tests/test_html.py
View file

@ -1089,12 +1089,16 @@ async def test_redirect_percent_encoding_to_tilde_encoding(ds_client, path, expe
@pytest.mark.parametrize( @pytest.mark.parametrize(
"path,config,expected_links", "path,config,expected_links",
( (
("/fixtures", {}, [("/", "home")]), ("/fixtures", {}, [("/", "home"), ("/fixtures", "fixtures")]),
("/fixtures", {"allow": False, "databases": {"fixtures": {"allow": True}}}, []), (
"/fixtures",
{"allow": False, "databases": {"fixtures": {"allow": True}}},
[("/fixtures", "fixtures")],
),
( (
"/fixtures/facetable", "/fixtures/facetable",
{"allow": False, "databases": {"fixtures": {"allow": True}}}, {"allow": False, "databases": {"fixtures": {"allow": True}}},
[("/fixtures", "fixtures")], [("/fixtures", "fixtures"), ("/fixtures/facetable", "facetable")],
), ),
( (
"/fixtures/facetable/1", "/fixtures/facetable/1",
@ -1110,15 +1114,6 @@ async def test_redirect_percent_encoding_to_tilde_encoding(ds_client, path, expe
{"allow": False, "databases": {"fixtures": {"allow": True}}}, {"allow": False, "databases": {"fixtures": {"allow": True}}},
[("/fixtures", "fixtures"), ("/fixtures/facetable", "facetable")], [("/fixtures", "fixtures"), ("/fixtures/facetable", "facetable")],
), ),
# TODO: what
# (
# "/fixtures/facetable/1",
# {
# "allow": False,
# "databases": {"fixtures": {"tables": {"facetable": {"allow": True}}}},
# },
# [("/fixtures/facetable", "facetable")],
# ),
), ),
) )
async def test_breadcrumbs_respect_permissions(ds_client, path, config, expected_links): async def test_breadcrumbs_respect_permissions(ds_client, path, config, expected_links):