From 915ef79b08862680e82d6a772d6ead22735e9a2f Mon Sep 17 00:00:00 2001 From: Ben Spaulding Date: Sun, 12 Jul 2015 15:16:27 -0500 Subject: [PATCH] Fixed #25115 -- Made admindocs view bookmarklet reverse the URL rather than hardcode it. --- django/contrib/admindocs/templates/admin_doc/bookmarklets.html | 2 +- tests/admin_docs/tests.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/django/contrib/admindocs/templates/admin_doc/bookmarklets.html b/django/contrib/admindocs/templates/admin_doc/bookmarklets.html index 937b0e2bc5..bb5e8b442d 100644 --- a/django/contrib/admindocs/templates/admin_doc/bookmarklets.html +++ b/django/contrib/admindocs/templates/admin_doc/bookmarklets.html @@ -19,7 +19,7 @@ select the bookmarklet from any page in the site.

{% endblocktrans %}
-

{% trans "Documentation for this page" %}

+

{% trans "Documentation for this page" %}

{% trans "Jumps you from any page to the documentation for the view that generates that page." %}

diff --git a/tests/admin_docs/tests.py b/tests/admin_docs/tests.py index 51d03ebd77..b48d33301f 100644 --- a/tests/admin_docs/tests.py +++ b/tests/admin_docs/tests.py @@ -74,7 +74,7 @@ class AdminDocViewTests(TestDataMixin, AdminDocsTestCase): def test_bookmarklets(self): response = self.client.get(reverse('django-admindocs-bookmarklets')) - self.assertContains(response, 'http://testserver/admin/doc/views/') + self.assertContains(response, '/admindocs/views/') def test_templatetag_index(self): response = self.client.get(reverse('django-admindocs-tags'))