diff --git a/adminsortable/admin.py b/adminsortable/admin.py index a2e36a2..a94d6a5 100644 --- a/adminsortable/admin.py +++ b/adminsortable/admin.py @@ -357,7 +357,9 @@ class SortableInlineBase(SortableAdminBase, InlineModelAdmin): class SortableTabularInline(TabularInline, SortableInlineBase): """Custom template that enables sorting for tabular inlines""" - if VERSION < (1, 6): + if VERSION >= (1, 10): + template = 'adminsortable/edit_inline/tabular-1.10.x.html' + elif VERSION < (1, 6): template = 'adminsortable/edit_inline/tabular-1.5.x.html' else: template = 'adminsortable/edit_inline/tabular.html' @@ -365,7 +367,9 @@ class SortableTabularInline(TabularInline, SortableInlineBase): class SortableStackedInline(StackedInline, SortableInlineBase): """Custom template that enables sorting for stacked inlines""" - if VERSION < (1, 6): + if VERSION >= (1, 10): + template = 'adminsortable/edit_inline/stacked-1.10.x.html' + elif VERSION < (1, 6): template = 'adminsortable/edit_inline/stacked-1.5.x.html' else: template = 'adminsortable/edit_inline/stacked.html' @@ -373,7 +377,9 @@ class SortableStackedInline(StackedInline, SortableInlineBase): class SortableGenericTabularInline(GenericTabularInline, SortableInlineBase): """Custom template that enables sorting for tabular inlines""" - if VERSION < (1, 6): + if VERSION >= (1, 10): + template = 'adminsortable/edit_inline/tabular-1.10.x.html' + elif VERSION < (1, 6): template = 'adminsortable/edit_inline/tabular-1.5.x.html' else: template = 'adminsortable/edit_inline/tabular.html' @@ -381,7 +387,9 @@ class SortableGenericTabularInline(GenericTabularInline, SortableInlineBase): class SortableGenericStackedInline(GenericStackedInline, SortableInlineBase): """Custom template that enables sorting for stacked inlines""" - if VERSION < (1, 6): + if VERSION >= (1, 10): + template = 'adminsortable/edit_inline/stacked-1.10.x.html' + elif VERSION < (1, 6): template = 'adminsortable/edit_inline/stacked-1.5.x.html' else: template = 'adminsortable/edit_inline/stacked.html' diff --git a/adminsortable/templates/adminsortable/edit_inline/stacked-1.10.x.html b/adminsortable/templates/adminsortable/edit_inline/stacked-1.10.x.html new file mode 100644 index 0000000..735e070 --- /dev/null +++ b/adminsortable/templates/adminsortable/edit_inline/stacked-1.10.x.html @@ -0,0 +1,28 @@ +{% load i18n admin_urls static %} +
+
+

{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}

+{{ 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|capfirst }}: {% 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 %} +

+ {% if inline_admin_form.form.non_field_errors %}{{ inline_admin_form.form.non_field_errors }}{% endif %} + {% for fieldset in inline_admin_form %} + {% include "admin/includes/fieldset.html" %} + {% endfor %} + {% if inline_admin_form.needs_explicit_pk_field %}{{ inline_admin_form.pk_field.field }}{% endif %} + {{ inline_admin_form.fk_field.field }} + {% if inline_admin_form.original %} + + {% endif %} +
{% endfor %} +
+
diff --git a/adminsortable/templates/adminsortable/edit_inline/tabular-1.10.x.html b/adminsortable/templates/adminsortable/edit_inline/tabular-1.10.x.html new file mode 100644 index 0000000..110c62c --- /dev/null +++ b/adminsortable/templates/adminsortable/edit_inline/tabular-1.10.x.html @@ -0,0 +1,78 @@ +{% load i18n admin_urls static admin_modify django_template_additions %} +
+ +
\ No newline at end of file