diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-06-08 01:48:41 -0700 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2012-06-08 01:48:41 -0700 |
| commit | 23d230f05833a63e951b8f451ff6c9f570eb3208 (patch) | |
| tree | 7bfba5d08ef494684df6ce6d19958dce9d56674f /django | |
| parent | c1729510aae7eb9e534ef62dfd54c37a6f89c193 (diff) | |
| parent | e1643e3535c4160c1a56c80f4d4db9848dc65e7a (diff) | |
Merge pull request #123 from apollo13/ticket18381
Fixed #18381 -- Stopped escaping object ids
when passing them to the contenttypes.shortcut view.
Thanks apollo13 for the patch and dhepper for the review.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/templates/admin/change_form.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html index 79c4f1bdf4..ead37b187f 100644 --- a/django/contrib/admin/templates/admin/change_form.html +++ b/django/contrib/admin/templates/admin/change_form.html @@ -31,7 +31,7 @@ <ul class="object-tools"> {% block object-tools-items %} <li><a href="history/" class="historylink">{% trans "History" %}</a></li> - {% if has_absolute_url %}<li><a href="../../../r/{{ content_type_id }}/{{ object_id }}/" class="viewsitelink">{% trans "View on site" %}</a></li>{% endif%} + {% if has_absolute_url %}<li><a href="../../../r/{{ content_type_id }}/{{ original.pk }}/" class="viewsitelink">{% trans "View on site" %}</a></li>{% endif%} {% endblock %} </ul> {% endif %}{% endif %} |