Commit 9d9f0acd authored by Nick Sandford's avatar Nick Sandford Committed by Tim Graham
Browse files

Fixed #13163 -- Added ability to show change links on inline objects in admin. 

Thanks DrMeers for the suggestion.
parent 9a922dca

django/contrib/admin/options.py

+2 −0
Original line number Diff line number Diff line
@@ -1721,6 +1721,7 @@ class InlineModelAdmin(BaseModelAdmin): 
    verbose_name = None

    verbose_name_plural = None

    can_delete = True

    show_change_link = False



    checks_class = InlineModelAdminChecks
@@ -1728,6 +1729,7 @@ class InlineModelAdmin(BaseModelAdmin): 
        self.admin_site = admin_site

        self.parent_model = parent_model

        self.opts = self.model._meta

        self.has_registered_model = admin_site.is_registered(self.model)

        super(InlineModelAdmin, self).__init__()

        if self.verbose_name is None:

            self.verbose_name = self.model._meta.verbose_name

django/contrib/admin/sites.py

+6 −0
Original line number Diff line number Diff line
@@ -114,6 +114,12 @@ class AdminSite(object): 
                raise NotRegistered('The model %s is not registered' % model.__name__)

            del self._registry[model]



    def is_registered(self, model):

        """

        Check if a model class is registered with this `AdminSite`.

        """

        return model in self._registry



    def add_action(self, action, name=None):

        """

        Register an action to be available globally.

django/contrib/admin/static/admin/css/base.css

+1 −1
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ div.breadcrumbs { 
    background: url(../img/icon_addlink.gif) 0 .2em no-repeat;

}



.changelink {

.changelink, .inlinechangelink {

    padding-left: 12px;

    background: url(../img/icon_changelink.gif) 0 .2em no-repeat;

}

django/contrib/admin/templates/admin/edit_inline/stacked.html

+3 −2
Original line number Diff line number Diff line 
{% load i18n admin_static %}

{% load i18n admin_urls admin_static %}

<div class="inline-group" id="{{ inline_admin_formset.formset.prefix }}-group">

  <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>

{{ inline_admin_formset.formset.management_form }}

{{ inline_admin_formset.formset.non_form_errors }}



{% for inline_admin_form in inline_admin_formset %}<div class="inline-related{% if inline_admin_form.original or inline_admin_form.show_url %} has_original{% endif %}{% if forloop.last %} empty-form last-related{% endif %}" id="{{ inline_admin_formset.formset.prefix }}-{% if not forloop.last %}{{ forloop.counter0 }}{% else %}empty{% endif %}">

  <h3><b>{{ inline_admin_formset.opts.verbose_name|capfirst }}:</b>&nbsp;<span class="inline_label">{% if inline_admin_form.original %}{{ inline_admin_form.original }}{% else %}#{{ forloop.counter }}{% endif %}</span>

  <h3><b>{{ inline_admin_formset.opts.verbose_name|capfirst }}:</b>&nbsp;<span class="inline_label">{% if inline_admin_form.original %}{{ inline_admin_form.original }}{% if inline_admin_form.model_admin.show_change_link and inline_admin_form.model_admin.has_registered_model %} <a href="{% url inline_admin_form.model_admin.opts|admin_urlname:'change' inline_admin_form.original.pk|admin_urlquote %}" class="inlinechangelink">{% trans "Change" %}</a>{% endif %}

{% else %}#{{ forloop.counter }}{% endif %}</span>

      {% if inline_admin_form.show_url %}<a href="{{ inline_admin_form.absolute_url }}">{% trans "View on site" %}</a>{% endif %}

    {% if inline_admin_formset.formset.can_delete and inline_admin_form.original %}<span class="delete">{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}</span>{% endif %}

  </h3>

django/contrib/admin/templates/admin/edit_inline/tabular.html

+5 −2
Original line number Diff line number Diff line 
{% load i18n admin_static admin_modify %}

{% load i18n admin_urls admin_static admin_modify %}

<div class="inline-group" id="{{ inline_admin_formset.formset.prefix }}-group">

  <div class="tabular inline-related {% if forloop.last %}last-related{% endif %}">

{{ inline_admin_formset.formset.management_form }}
@@ -26,7 +26,10 @@ 
             id="{{ inline_admin_formset.formset.prefix }}-{% if not forloop.last %}{{ forloop.counter0 }}{% else %}empty{% endif %}">

        <td class="original">

          {% if inline_admin_form.original or inline_admin_form.show_url %}<p>

          {% if inline_admin_form.original %} {{ inline_admin_form.original }}{% endif %}

          {% if inline_admin_form.original %}

          {{ inline_admin_form.original }}

          {% if inline_admin_form.model_admin.show_change_link and inline_admin_form.model_admin.has_registered_model %}<a href="{% url inline_admin_form.model_admin.opts|admin_urlname:'change' inline_admin_form.original.pk|admin_urlquote %}" class="inlinechangelink">{% trans "Change" %}</a>{% endif %}

          {% endif %}

          {% if inline_admin_form.show_url %}<a href="{{ inline_admin_form.absolute_url }}">{% trans "View on site" %}</a>{% endif %}

            </p>{% endif %}

          {% if inline_admin_form.needs_explicit_pk_field %}{{ inline_admin_form.pk_field.field }}{% endif %}