From: Karl O. Pinc
Date: Sun, 29 Sep 2024 19:33:41 +0000 (-0500)
Subject: Pass template a "locals" dict so it can modify variables
X-Git-Url: https://papio.biology.duke.edu/gitweb/?a=commitdiff_plain;h=886e91fef8bddb98e43eeb014efa757ef960596c;p=pgwui_sql
Pass template a "locals" dict so it can modify variables
---
diff --git a/src/pgwui_sql/templates/sql.mak b/src/pgwui_sql/templates/sql.mak
index c3726d5..10584fb 100644
--- a/src/pgwui_sql/templates/sql.mak
+++ b/src/pgwui_sql/templates/sql.mak
@@ -84,11 +84,14 @@
}!
% if sql:
- <% if upload_sql:
- sql = pgwui_sql.lib.normalize_newlines(sql)
+ <%
+ if upload_sql:
+ locals['sql'] = pgwui_sql.lib.normalize_newlines(sql)
+ else:
+ locals['sql'] = sql
%>
- % for sql_line in sql.rstrip().split('\n'):
+ % for sql_line in locals['sql'].rstrip().split('\n'):
- ${sql_line}
% endfor
diff --git a/src/pgwui_sql/views/sql.py b/src/pgwui_sql/views/sql.py
index 69eeab1..dd2e229 100644
--- a/src/pgwui_sql/views/sql.py
+++ b/src/pgwui_sql/views/sql.py
@@ -377,6 +377,7 @@ def sql_view(request):
response['pgwui']['pgwui_sql'] = settings['pgwui']['pgwui_sql']
response['result_rows'] = uh.sql_results
+ response['locals'] = {} # Template uses this for local vars
log_response(response)
return response
diff --git a/tests/templates/test_templates.py b/tests/templates/test_templates.py
index dacf952..6bfd916 100644
--- a/tests/templates/test_templates.py
+++ b/tests/templates/test_templates.py
@@ -47,6 +47,7 @@ request = pyramid.testing.DummyRequest()
request.registry = config.registry
stock_template_args = {
+ 'locals': {},
'pgwui': config.get_settings()['pgwui'],
'havecreds': False,
'errors': [],