- Dynamicize URLs for SQLAlchemy subpanels.

Pylons · Aug 11, 2011 · c85b97f · c85b97f
1 parent 3ff51ce
commit c85b97f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -6,6 +6,8 @@ Next release
 
 - Add an "alias" to the add_tween call; requires newest Pyramid trunk.
 
+- Dynamicize URLs for SQLAlchemy subpanels.
+
 0.2 (2011-08-07)
 ----------------
 

diff --git a/pyramid_debugtoolbar/panels/sqla.py b/pyramid_debugtoolbar/panels/sqla.py
@@ -8,6 +8,8 @@
 from pyramid.threadlocal import get_current_request
 from pyramid_debugtoolbar.panels import DebugPanel
 from pyramid_debugtoolbar.utils import format_sql
+from pyramid_debugtoolbar.utils import STATIC_PATH
+from pyramid_debugtoolbar.utils import ROOT_ROUTE_NAME
 
 lock = threading.Lock()
 
@@ -97,10 +99,15 @@ def content(self):
                 'hash': hash,
                 'params': params,
                 'is_select': is_select,
-                'context': query['context']
+                'context': query['context'],
             })
 
-        vars = {'queries': data}
+        vars = {
+            'static_path': self.request.static_url(STATIC_PATH),
+            'root_path': self.request.route_url(ROOT_ROUTE_NAME),
+            'queries':data,
+            }
+
         delattr(self.request, 'pdtb_sqla_queries')
 
         return self.render(

diff --git a/pyramid_debugtoolbar/panels/templates/sqlalchemy.jinja2 b/pyramid_debugtoolbar/panels/templates/sqlalchemy.jinja2
@@ -14,8 +14,8 @@
 			<td>
 			{% if query.params %}
 				{% if query.is_select %}
-				<a class="remoteCall" href="/_debug_toolbar/sqlalchemy/sql_select?sql={{ query.raw_sql|urlencode }}&amp;params={{ query.params|urlencode }}&amp;duration={{ query.duration|string|urlencode }}&amp;hash={{ query.hash }}&amp;engine_id={{ query.engine_id|string|urlencode }}">SELECT</a><br />
-				<a class="remoteCall" href="/_debug_toolbar/sqlalchemy/sql_explain?sql={{ query.raw_sql|urlencode }}&amp;params={{ query.params|urlencode }}&amp;duration={{ query.duration|string|urlencode }}&amp;hash={{ query.hash }}&amp;engine_id={{ query.engine_id|string|urlencode }}">EXPLAIN</a><br />
+				<a class="remoteCall" href="{{ root_path }}/sqlalchemy/sql_select?sql={{ query.raw_sql|urlencode }}&amp;params={{ query.params|urlencode }}&amp;duration={{ query.duration|string|urlencode }}&amp;hash={{ query.hash }}&amp;engine_id={{ query.engine_id|string|urlencode }}">SELECT</a><br />
+				<a class="remoteCall" href="{{ root_path}}/sqlalchemy/sql_explain?sql={{ query.raw_sql|urlencode }}&amp;params={{ query.params|urlencode }}&amp;duration={{ query.duration|string|urlencode }}&amp;hash={{ query.hash }}&amp;engine_id={{ query.engine_id|string|urlencode }}">EXPLAIN</a><br />
 				{% endif %}
 			{% endif %}
 			</td>