Skip to content

Don't hardcode urls in templates. #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions debug_toolbar/panels/sql.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import uuid
from copy import copy

from django.core.urlresolvers import reverse
from django.db import connections
from django.db.backends import BaseDatabaseWrapper
from django.utils.translation import ugettext_lazy as _, ungettext_lazy as __
Expand Down Expand Up @@ -134,6 +135,11 @@ def title(self):
def url(self):
return ''

def process_request(self, request):
self.context['sql_select_url'] = reverse('sql_select', urlconf=request.urlconf)
self.context['sql_explain_url'] = reverse('sql_explain', urlconf=request.urlconf)
self.context['sql_profile_url'] = reverse('sql_profile', urlconf=request.urlconf)

def process_response(self, request, response):
if self._queries:
width_ratio_tally = 0
Expand Down
2 changes: 2 additions & 0 deletions debug_toolbar/panels/template.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

from django import http
from django.conf import settings
from django.core.urlresolvers import reverse
from django.template.context import get_standard_processors
from django.test.signals import template_rendered
from django.utils.encoding import force_text
Expand Down Expand Up @@ -108,6 +109,7 @@ def url(self):

def process_request(self, request):
self.request = request
self.context['template_source_url'] = reverse('template_source', urlconf=request.urlconf)

def process_response(self, request, response):
context_processors = dict(
Expand Down
6 changes: 3 additions & 3 deletions debug_toolbar/templates/debug_toolbar/panels/sql.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@
<form method="post">
{{ query.form }}

<button formaction="/__debug__/sql_select/" class="remoteCall">Sel</button>
<button formaction="/__debug__/sql_explain/" class="remoteCall">Expl</button>
<button formaction="{{ sql_select_url }}" class="remoteCall">Sel</button>
<button formaction="{{ sql_explain_url }}" class="remoteCall">Expl</button>

{% ifequal query.engine 'mysql' %}
<button formaction="/__debug__/sql_profile/" class="remoteCall">Prof</button>
<button formaction="{{ sql_profile }}" class="remoteCall">Prof</button>
{% endifequal %}
</form>
{% endif %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h4>{% blocktrans count templates|length as template_count %}Template{% plural %
{% if templates %}
<dl>
{% for template in templates %}
<dt><strong><a class="remoteCall toggleTemplate" href="/__debug__/template_source/?template={{ template.template.name }}">{{ template.template.name|addslashes }}</a></strong></dt>
<dt><strong><a class="remoteCall toggleTemplate" href="{{ template_source_url }}?template={{ template.template.name }}">{{ template.template.name|addslashes }}</a></strong></dt>
<dd><samp>{{ template.template.origin_name|addslashes }}</samp></dd>
{% if template.context %}
<dd>
Expand Down
8 changes: 4 additions & 4 deletions debug_toolbar/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,14 @@ def template_source(request):
for loader_name in settings.TEMPLATE_LOADERS:
loader = find_template_loader(loader_name)
if loader is not None:
loaders.append(loader)
for loader in loaders:
loaders.append((loader_name, loader))
for loader_name, loader in loaders:
try:
source, display_name = loader.load_template_source(template_name)
origin = make_origin(display_name, loader, template_name, settings.TEMPLATE_DIRS)
break
except TemplateDoesNotExist:
source = "Template Does Not Exist: %s" % (template_name,)
except (TemplateDoesNotExist, NotImplementedError) as exc:
source = "Template Does Not Exist: %s (%s raised: %s)" % (template_name, loader_name, repr(exc))

try:
from pygments import highlight
Expand Down