Fixed the breadcrumbs in modern Django, added object_history template

Author: vdboor

polymorphic_tree/admin/childadmin.py

@@ -34,3 +34,11 @@ def delete_confirmation_template(self):
  templates = super(PolymorphicMPTTChildModelAdmin, self).delete_confirmation_template
  templates.insert(-2, "admin/polymorphic_tree/delete_confirmation.html")
  return templates
+
+ @property
+ def object_history_template(self):
+ # Insert template before default admin/polymorphic to have the tree in the breadcrumb
+ templates = super(PolymorphicMPTTChildModelAdmin, self).object_history_template
+ if isinstance(templates, list): # allow pre django-polymorphic 0.9.1 to work without errors.
+ templates.insert(-2, "admin/polymorphic_tree/object_history.html")
+ return templates

polymorphic_tree/templates/admin/polymorphic_tree/change_form.html

@@ -1,15 +1,3 @@
 {% extends "admin/change_form.html" %}
-{% 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="{% 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="{% 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>
-{% endbreadcrumb_scope %}{% endif %}{% endblock %}
+{% block breadcrumbs %}{% if not is_popup %}{% include "admin/polymorphic_tree/change_form_breadcrumbs.html" %}{% endif %}{% endblock %}

polymorphic_tree/templates/admin/polymorphic_tree/change_form_breadcrumbs.html

@@ -0,0 +1,21 @@
+{% load i18n admin_urls polymorphic_admin_tags polymorphic_tree_admin_tags %}
+
+{% breadcrumb_scope base_opts %}
+<div class="breadcrumbs">
+ <a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
+ {% if opts.app_config %}{# Django 1.7+ #}
+ &rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</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 %}
+ {% else %}
+ &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' %}">{{ module_name }}</a>{% else %}{{ module_name }}{% endif %}
+ {% endif %}
+
+ {# Add tree levels to polymorphic breadcrumb #}
+ {% for parent in original|mptt_breadcrumb %}
+ &rsaquo; <a href="{% url opts|admin_urlname:'change' parent.pk|admin_urlquote %}">{{ parent }}</a>
+ {% endfor %}
+
+ &rsaquo; {% if add %}{% trans 'Add' %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %}
+</div>
+{% endbreadcrumb_scope %}

polymorphic_tree/templates/admin/polymorphic_tree/delete_confirmation.html

@@ -4,13 +4,19 @@
 {# Add tree levels to polymorphic breadcrumb #}
 {% block breadcrumbs %}{% breadcrumb_scope base_opts %}
 <div class="breadcrumbs">
- <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="{% url opts|admin_urlname:'change' p.id %}">{{ p.title }}</a> &rsaquo;
+ <a href="{% url 'admin:index' %}">{% trans "Home" %}</a>
+ {% if opts.app_config %}{# Django 1.7+ #}
+ &rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
+ {% else %}
+ &rsaquo; <a href="{% url 'admin:app_list' app_label=app_label %}">{{ app_label|capfirst|escape }}</a>
+ {% endif %}
+ &rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>
+
+ {% for parent in object|mptt_breadcrumb %}
+ &rsaquo; <a href="{% url opts|admin_urlname:'change' parent.pk|admin_urlquote %}">{{ parent }}</a>
  {% endfor %}
- <a href="{% url opts|admin_urlname:'change' object.id %}">{{ object|truncatewords:"18" }}</a> &rsaquo;
- {% trans 'Delete' %}
+
+ &rsaquo; <a href="{% url opts|admin_urlname:'change' object.pk|admin_urlquote %}">{{ object|truncatewords:"18" }}</a>
+ &rsaquo; {% trans 'Delete' %}
 </div>
 {% endbreadcrumb_scope %}{% endblock %}

polymorphic_tree/templates/admin/polymorphic_tree/object_history.html

@@ -0,0 +1,10 @@
+{% extends 'admin/object_history.html' %}{% comment %}
+
+ This file is selected by default to display polymorphic mptt object history.
+ When using reversion or reversion-compare, this template could be replaced
+ with the proper {% extends "reversion/object_history.html" %} template.
+ Hence, the breadcrumb code is in a separate include file.
+
+{% endcommenr %}
+
+{% block breadcrumbs %}{% include "admin/polymorphic_tree/object_history_breadcrumbs.html" %}{% endblock %}

polymorphic_tree/templates/admin/polymorphic_tree/object_history_breadcrumbs.html

@@ -0,0 +1,20 @@
+{% load i18n admin_urls polymorphic_admin_tags polymorphic_tree_admin_tags %}
+
+{% breadcrumb_scope base_opts %}
+<div class="breadcrumbs">
+ <a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
+ {% if opts.app_config %}{# Django 1.7+ #}
+ &rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
+ {% else %}
+ &rsaquo; <a href="{% url 'admin:app_list' app_label=app_label %}">{{ app_label|capfirst|escape }}</a>
+ {% endif %}
+ &rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>
+
+ {% for parent in object|mptt_breadcrumb %}
+ &rsaquo; <a href="{% url opts|admin_urlname:'change' parent.pk|admin_urlquote %}">{{ parent }}</a>
+ {% endfor %}
+
+ &rsaquo; <a href="{% url opts|admin_urlname:'change' object.pk|admin_urlquote %}">{{ object|truncatewords:"18" }}</a>
+ &rsaquo; {% trans 'History' %}
+</div>
+{% endbreadcrumb_scope %}

setup.py

@@ -39,7 +39,7 @@ def find_version(*parts):
  license='Apache 2.0',
 
  install_requires=[
- 'django-polymorphic>=0.8.1', # ensure Django 1.9 compatibility
+ 'django-polymorphic>=0.9.1', # needed for object_history_template fix
  'django-mptt>=0.6.0', # Still allow 0.6 to have Django 1.5 support
  'django-tag-parser>=2.1', # ensure Django 1.8 compatibility
  'future>=0.12.2',