From db162bf89030d3b7fabc90a188daf951f71392bd Mon Sep 17 00:00:00 2001 From: Brandon Taylor Date: Tue, 14 Jan 2020 20:05:25 -0500 Subject: [PATCH] Fix inline admin templates to display FontAwesome icons and be Django 2 & 3 compatible. Version bump to 2.2.3. Updated READMEs. --- README.md | 4 ++-- README.rst | 4 ++-- adminsortable/__init__.py | 2 +- adminsortable/admin.py | 8 ++++---- .../adminsortable/edit_inline/stacked-1.10.x.html | 8 +++++++- .../adminsortable/edit_inline/tabular-1.10.x.html | 5 ++++- 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 5ae5623..b49baa8 100644 --- a/README.md +++ b/README.md @@ -609,8 +609,8 @@ ordering on top of that just seemed a little much in my opinion. ### Status django-admin-sortable is currently used in production. -### What's new in 2.2.2? -- Fixed FontAwesome icons not showing up in inline sortable templates. +### What's new in 2.2.3? +- Updated inline sortable templates to fix FontAwesome icon visibility and be compatible with Django 2 & 3. ### Future - Better template support for foreign keys that are self referential. If someone would like to take on rendering recursive sortables, that would be super. diff --git a/README.rst b/README.rst index dd1f326..8b66053 100644 --- a/README.rst +++ b/README.rst @@ -751,10 +751,10 @@ Status django-admin-sortable is currently used in production. -What’s new in 2.2.2? +What’s new in 2.2.3? ~~~~~~~~~~~~~~~~~~~~ -- Fixed FontAwesome icons not showing up in inline sortable templates. +- Updated inline sortable templates to fix FontAwesome icon visibility and be compatible with Django 2 & 3. Future ~~~~~~ diff --git a/adminsortable/__init__.py b/adminsortable/__init__.py index a642a1d..e7c887a 100644 --- a/adminsortable/__init__.py +++ b/adminsortable/__init__.py @@ -1,4 +1,4 @@ -VERSION = (2, 2, 2) +VERSION = (2, 2, 3) DEV_N = None diff --git a/adminsortable/admin.py b/adminsortable/admin.py index a21e2ff..a3c3362 100644 --- a/adminsortable/admin.py +++ b/adminsortable/admin.py @@ -358,7 +358,7 @@ class SortableInlineBase(SortableAdminBase, InlineModelAdmin): class SortableTabularInline(TabularInline, SortableInlineBase): """Custom template that enables sorting for tabular inlines""" - if VERSION < (2, 0): + if VERSION >= (2, 0): template = 'adminsortable/edit_inline/tabular-1.10.x.html' else: template = 'adminsortable/edit_inline/tabular.html' @@ -366,7 +366,7 @@ class SortableTabularInline(TabularInline, SortableInlineBase): class SortableStackedInline(StackedInline, SortableInlineBase): """Custom template that enables sorting for stacked inlines""" - if VERSION < (2, 0): + if VERSION >= (2, 0): template = 'adminsortable/edit_inline/stacked-1.10.x.html' else: template = 'adminsortable/edit_inline/stacked.html' @@ -374,7 +374,7 @@ class SortableStackedInline(StackedInline, SortableInlineBase): class SortableGenericTabularInline(GenericTabularInline, SortableInlineBase): """Custom template that enables sorting for tabular inlines""" - if VERSION < (2, 0): + if VERSION >= (2, 0): template = 'adminsortable/edit_inline/tabular-1.10.x.html' else: template = 'adminsortable/edit_inline/tabular.html' @@ -382,7 +382,7 @@ class SortableGenericTabularInline(GenericTabularInline, SortableInlineBase): class SortableGenericStackedInline(GenericStackedInline, SortableInlineBase): """Custom template that enables sorting for stacked inlines""" - if VERSION < (2, 0): + if VERSION >= (2, 0): template = 'adminsortable/edit_inline/stacked-1.10.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 index 735e070..00b3561 100644 --- a/adminsortable/templates/adminsortable/edit_inline/stacked-1.10.x.html +++ b/adminsortable/templates/adminsortable/edit_inline/stacked-1.10.x.html @@ -9,7 +9,13 @@ {{ 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 %} +

+ {% if inline_admin_form.original %} + {% with initial_forms_count=inline_admin_formset.formset.management_form.INITIAL_FORMS.value %} + + {% endwith %} + {% endif %} + {{ 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 %} diff --git a/adminsortable/templates/adminsortable/edit_inline/tabular-1.10.x.html b/adminsortable/templates/adminsortable/edit_inline/tabular-1.10.x.html index 110c62c..9abc9cb 100644 --- a/adminsortable/templates/adminsortable/edit_inline/tabular-1.10.x.html +++ b/adminsortable/templates/adminsortable/edit_inline/tabular-1.10.x.html @@ -29,6 +29,9 @@ id="{{ inline_admin_formset.formset.prefix }}-{% if not forloop.last %}{{ forloop.counter0 }}{% else %}empty{% endif %}"> {% if inline_admin_form.original or inline_admin_form.show_url %}

+ {% with initial_forms_count=inline_admin_form.formset.management_form.INITIAL_FORMS.value %} + + {% endwith %} {% 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 %} @@ -75,4 +78,4 @@

- \ No newline at end of file +