Skip to content

Commit 1d6349f

Browse files
committed
Remove editor default. Add note about configuring editor in panel.
1 parent 023144f commit 1d6349f

4 files changed

Lines changed: 30 additions & 3 deletions

File tree

debug_toolbar/panels/templates/panel.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from django.urls import path
1414
from django.utils.translation import gettext_lazy as _
1515

16+
from debug_toolbar import settings as dt_settings
1617
from debug_toolbar.panels import Panel
1718
from debug_toolbar.panels.sql.tracking import SQLQueryTriggered, allow_sql
1819
from debug_toolbar.panels.templates import views
@@ -247,4 +248,5 @@ def get_stats(self):
247248
origin_name = template["template"]["origin_name"]
248249
if origin_name and origin_name != UNKNOWN_SOURCE:
249250
template["template"]["editor_url"] = get_editor_url(origin_name)
251+
stats["editor_configured"] = bool(dt_settings.get_config()["EDITOR"])
250252
return stats

debug_toolbar/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def _is_running_tests():
2424
"debug_toolbar.panels.profiling.ProfilingPanel",
2525
"debug_toolbar.panels.redirects.RedirectsPanel",
2626
},
27-
"EDITOR": "vscode",
27+
"EDITOR": "",
2828
"INSERT_BEFORE": "</body>",
2929
"IS_RUNNING_TESTS": _is_running_tests(),
3030
"OBSERVE_REQUEST_CALLBACK": "debug_toolbar.toolbar.observe_request",

debug_toolbar/templates/debug_toolbar/panels/templates.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@ <h4>{% blocktranslate count template_count=template_dirs|length %}Template path{
1111
{% endif %}
1212

1313
<h4>{% blocktranslate count template_count=templates|length %}Template{% plural %}Templates{% endblocktranslate %}</h4>
14+
{% if not editor_configured %}
15+
<p>
16+
{% blocktranslate %}
17+
To open template files in your editor, set the
18+
<a target="_blank" href="https://django-debug-toolbar.readthedocs.io/en/latest/configuration.html#debug-toolbar-config:~:text=EDITOR">DEBUG_TOOLBAR_CONFIG["EDITOR"]</a>
19+
setting.
20+
{% endblocktranslate %}
21+
</p>
22+
{% endif %}
1423
{% if templates %}
1524
<dl>
1625
{% for template in templates %}

tests/panels/test_template.py

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,18 @@ def test_template_source(self):
149149
response = self.client.get(url, data)
150150
self.assertEqual(response.status_code, 200)
151151

152-
def test_get_stats_includes_editor_url(self):
152+
def test_get_stats_without_editor_configured(self):
153+
response = self.panel.process_request(self.request)
154+
Template("", origin=Origin("test.html")).render(Context({}))
155+
self.panel.generate_stats(self.request, response)
156+
stats = self.panel.get_stats()
157+
self.assertIsNone(stats["templates"][0]["template"]["editor_url"])
158+
self.assertFalse(stats["editor_configured"])
159+
160+
@override_settings(
161+
DEBUG_TOOLBAR_CONFIG={"EDITOR": "vscode"},
162+
)
163+
def test_get_stats_with_editor_configured(self):
153164
response = self.panel.process_request(self.request)
154165
Template("", origin=Origin("test.html")).render(Context({}))
155166
self.panel.generate_stats(self.request, response)
@@ -158,13 +169,18 @@ def test_get_stats_includes_editor_url(self):
158169
stats["templates"][0]["template"]["editor_url"],
159170
"vscode://file/test.html:1",
160171
)
172+
self.assertTrue(stats["editor_configured"])
161173

162-
def test_get_stats_excludes_editor_url(self):
174+
@override_settings(
175+
DEBUG_TOOLBAR_CONFIG={"EDITOR": "vscode"},
176+
)
177+
def test_get_stats_excludes_editor_with_no_template(self):
163178
response = self.panel.process_request(self.request)
164179
Template("").render(Context({}))
165180
self.panel.generate_stats(self.request, response)
166181
stats = self.panel.get_stats()
167182
self.assertNotIn("editor_url", stats["templates"][0]["template"])
183+
self.assertTrue(stats["editor_configured"])
168184

169185

170186
@override_settings(

0 commit comments

Comments
 (0)