Fix breadcrumb for django-parler delete translation page.

Using standard admin_urlname filters instead of ../../

Author: vdboor

CHANGES.rst

@@ -2,6 +2,7 @@ Changes in git
 --------------
 
 * Fixed URL resolving for for multi admin sites.
+* Fixed URL breadcrumbs for delete page, visible when using non-standard delete URLs (e.g. django-parler_'s delete translation page).
 * Enforcing at least django-polymorphic_ 0.7.1 for Django 1.8 compatibility.
 
 
@@ -145,6 +146,7 @@ and not bother with a plugin registration system.
 
 
 .. _django-fluent-pages: https://github.com/edoburu/django-fluent-pages
+.. _django-parler: https://github.com/edoburu/django-parler
 .. _django-polymorphic: https://github.com/chrisglass/django_polymorphic
 .. _django-tag-parser: https://github.com/edoburu/django-tag-parser
 

polymorphic_tree/templates/admin/polymorphic_tree/change_form.html

@@ -1,14 +1,14 @@
 {% extends "admin/change_form.html" %}
-{% load i18n admin_modify polymorphic_admin_tags polymorphic_tree_admin_tags %}
+{% load i18n admin_modify admin_urls polymorphic_admin_tags polymorphic_tree_admin_tags %}
 
 {# Add tree levels to polymorphic breadcrumb #}
 {% block breadcrumbs %}{% if not is_popup %}{% breadcrumb_scope base_opts %}
 <div class="breadcrumbs">
- <a href="../../../">{% trans "Home" %}</a> &rsaquo;
- <a href="../../">{{ app_label|capfirst|escape }}</a> &rsaquo;
- {% if has_change_permission %}<a href="../">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} &rsaquo;
+ <a href="{% url 'admin:index' %}">{% trans "Home" %}</a> &rsaquo;
+ <a href="{% url 'admin:app_list' app_label=app_label %}">{{ app_label|capfirst|escape }}</a> &rsaquo;
+ {% if has_change_permission %}<a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} &rsaquo;
  {% for p in original|mptt_breadcrumb %}
- <a href="../{{ p.id }}/">{{ p }}</a> &rsaquo;
+ <a href="{% url opts|admin_urlname:'change' p.id %}">{{ p.title }}</a> &rsaquo;
  {% endfor %}
  {% if add %}{% trans "Add" %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %}
 </div>

polymorphic_tree/templates/admin/polymorphic_tree/delete_confirmation.html

@@ -1,16 +1,16 @@
 {% extends "admin/delete_confirmation.html" %}
-{% load i18n polymorphic_admin_tags polymorphic_tree_admin_tags %}
+{% load i18n admin_urls polymorphic_admin_tags polymorphic_tree_admin_tags %}
 
 {# Add tree levels to polymorphic breadcrumb #}
 {% block breadcrumbs %}{% breadcrumb_scope base_opts %}
 <div class="breadcrumbs">
- <a href="../../../../">{% trans "Home" %}</a> &rsaquo;
- <a href="../../../">{{ app_label|capfirst|escape }}</a> &rsaquo;
- <a href="../../">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;
+ <a href="{% url 'admin:index' %}">{% trans "Home" %}</a> &rsaquo;
+ <a href="{% url 'admin:app_list' app_label=app_label %}">{{ app_label|capfirst|escape }}</a> &rsaquo;
+ <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;
  {% for p in object|mptt_breadcrumb %}
- <a href="../{{ p.id }}/">{{ p.title }}</a> &rsaquo;
+ <a href="{% url opts|admin_urlname:'change' p.id %}">{{ p.title }}</a> &rsaquo;
  {% endfor %}
- <a href="../">{{ object|truncatewords:"18" }}</a> &rsaquo;
+ <a href="{% url opts|admin_urlname:'change' object.id %}">{{ object|truncatewords:"18" }}</a> &rsaquo;
  {% trans 'Delete' %}
 </div>
 {% endbreadcrumb_scope %}{% endblock %}