Commit 853f4d29 authored by Brian Rosner's avatar Brian Rosner
Browse files

Fixed #8547 -- Corrected the breadcrumb display in the object_history.html... 

Fixed #8547 -- Corrected the breadcrumb display in the object_history.html template. Thanks sorl for catching this.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8555 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 834ce902

django/contrib/admin/options.py

+2 −0
Original line number Diff line number Diff line
@@ -702,6 +702,7 @@ class ModelAdmin(BaseModelAdmin): 
        from django.contrib.admin.models import LogEntry

        model = self.model

        opts = model._meta

        app_label = opts.app_label

        action_list = LogEntry.objects.filter(

            object_id = object_id,

            content_type__id__exact = ContentType.objects.get_for_model(model).id
@@ -714,6 +715,7 @@ class ModelAdmin(BaseModelAdmin): 
            'module_name': capfirst(force_unicode(opts.verbose_name_plural)),

            'object': obj,

            'root_path': self.admin_site.root_path,

            'app_label': app_label,

        }

        context.update(extra_context or {})

        return render_to_response(self.object_history_template or [

django/contrib/admin/templates/admin/object_history.html

+7 −1
Original line number Diff line number Diff line
@@ -2,7 +2,13 @@ 
{% load i18n %}



{% block breadcrumbs %}

<div class="breadcrumbs"><a href="../../../../">{% trans 'Home' %}</a> &rsaquo; <a href="../../">{{ module_name }}</a> &rsaquo; <a href="../">{{ object|truncatewords:"18" }}</a> &rsaquo; {% trans 'History' %}</div>

<div class="breadcrumbs">

    <a href="../../../../">{% trans 'Home' %}</a> &rsaquo; 

    <a href="../../../">{{ app_label|capfirst|escape }}</a> &rsaquo; 

    <a href="../../">{{ module_name }}</a> &rsaquo; 

    <a href="../">{{ object|truncatewords:"18" }}</a> &rsaquo; 

    {% trans 'History' %}

</div>

{% endblock %}



{% block content %}