diff options
| author | Florian Apolloner <florian@apolloner.eu> | 2012-06-07 17:34:25 +0200 |
|---|---|---|
| committer | Florian Apolloner <florian@apolloner.eu> | 2012-06-07 17:52:12 +0200 |
| commit | e1643e3535c4160c1a56c80f4d4db9848dc65e7a (patch) | |
| tree | 0e0b5de59405131dce1ac7f6597904ee3d50ede3 /django | |
| parent | 840ffd80baad85c05670d6b642f654cffaa93cc3 (diff) | |
Don't escape object ids when passing to the contenttypes.shortcut view.
This commit also changes the string pk to string_pk instead of id, to test
if the admin uses .pk throughout the codebase.
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 %} |