From feeb4e7910a9fb134f0e8caf85afefab95433d0f Mon Sep 17 00:00:00 2001 From: Jorge Marques Date: Tue, 13 Oct 2015 18:41:51 +0100 Subject: [PATCH] Updates the stacked and tabular inline templates so that the "show_change_link" option is taken into account, mimicking the corresponding templates in Django 1.8 --- .../templates/adminsortable/edit_inline/stacked.html | 5 +++-- .../templates/adminsortable/edit_inline/tabular.html | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/adminsortable/templates/adminsortable/edit_inline/stacked.html b/adminsortable/templates/adminsortable/edit_inline/stacked.html index eb424b7..0bf7d7b 100644 --- a/adminsortable/templates/adminsortable/edit_inline/stacked.html +++ b/adminsortable/templates/adminsortable/edit_inline/stacked.html @@ -1,11 +1,12 @@ -{% load i18n admin_static %} +{% load i18n admin_urls admin_static %}

{{ inline_admin_formset.opts.verbose_name_plural|title }} {% if inline_admin_formset.formset.initial_form_count > 1 %} - {% trans "drag and drop to change order" %}{% endif %}

{{ inline_admin_formset.formset.management_form }} {{ inline_admin_formset.formset.non_form_errors }} {% for inline_admin_form in inline_admin_formset %}
-

{{ inline_admin_formset.opts.verbose_name|title }}: {% if inline_admin_form.original %}{{ inline_admin_form.original }}{% else %}#{{ forloop.counter }}{% endif %} +

{{ inline_admin_formset.opts.verbose_name|title }}: {% 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 %} {% trans "Change" %}{% endif %} + {% else %}#{{ forloop.counter }}{% endif %} {% if inline_admin_form.show_url %}{% trans "View on site" %}{% endif %} {% if inline_admin_formset.formset.can_delete and inline_admin_form.original %}{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}{% endif %}

diff --git a/adminsortable/templates/adminsortable/edit_inline/tabular.html b/adminsortable/templates/adminsortable/edit_inline/tabular.html index ec572b1..247818e 100644 --- a/adminsortable/templates/adminsortable/edit_inline/tabular.html +++ b/adminsortable/templates/adminsortable/edit_inline/tabular.html @@ -1,4 +1,4 @@ -{% load i18n admin_static admin_modify %}{% load cycle from future %} +{% load i18n admin_urls admin_static admin_modify %}{% load cycle from future %}