From 54f805dca3fd9e05d9276aedec83036a2e36578c Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Mon, 18 Jun 2018 08:11:11 -0700 Subject: [PATCH] Advanced export box now obeys allow_csv_stream config - refs #266 --- datasette/templates/table.html | 2 +- datasette/views/base.py | 1 + datasette/views/database.py | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/datasette/templates/table.html b/datasette/templates/table.html index 16f17fbf..656cb0a1 100644 --- a/datasette/templates/table.html +++ b/datasette/templates/table.html @@ -146,7 +146,7 @@ CSV options: {% if expandable_columns %}{% endif %} - {% if next_url %}{% endif %} + {% if next_url and config.allow_csv_stream %}{% endif %} {% for key, value in url_csv_args.items() %} {% if key != "_labels" %} diff --git a/datasette/views/base.py b/datasette/views/base.py index c3da3ab7..14179824 100644 --- a/datasette/views/base.py +++ b/datasette/views/base.py @@ -401,6 +401,7 @@ class BaseView(RenderMixin): "extra_css_urls": self.ds.extra_css_urls(), "extra_js_urls": self.ds.extra_js_urls(), "datasette_version": __version__, + "config": self.ds.config, } } if "metadata" not in context: diff --git a/datasette/views/database.py b/datasette/views/database.py index a7df485b..6badc724 100644 --- a/datasette/views/database.py +++ b/datasette/views/database.py @@ -31,7 +31,6 @@ class DatabaseView(BaseView): {"name": query_name, "sql": query_sql} for query_name, query_sql in (metadata.get("queries") or {}).items() ], - "config": self.ds.config, }, { "database_hash": hash, "show_hidden": request.args.get("_show_hidden"),