# This is a combination of 2 commits.

# This is the 1st commit message:

use patch files to create Django’s edit_inline templates

# This is the commit message #2:

fix yaml syntax

fix yaml syntax

fix yaml syntax

fix yaml syntax

use proper base class for inlines

use proper base class for inlines

Author: jrief

.github/workflows/publish.yml

@@ -15,6 +15,9 @@ jobs:
     environment:
        name: deploy
 
+    env:
+      DJANGO_VERSIONS: ["4.0"]
+
     strategy:
       matrix:
         python-version: ["3.9"]
@@ -39,6 +42,15 @@ jobs:
       run: |
         npm run build
         npm run uglify
+    -name: Patch templates
+      run: |
+        mkdir --parents adminsortable2/templates/adminsortable2/edit_inline
+        for django_version in $DJANGO_VERSIONS; do
+          curl --output adminsortable2/templates/adminsortable2/edit_inline/stacked-django-${django_version}.html https://raw.githubusercontent.com/django/django/stable/${django_version}.x/django/contrib/admin/templates/admin/edit_inline/stacked.html
+          curl --output adminsortable2/templates/adminsortable2/edit_inline/tabular-django-${django_version}.html https://raw.githubusercontent.com/django/django/stable/${django_version}.x/django/contrib/admin/templates/admin/edit_inline/tabular.html
+          patch -p0 adminsortable2/templates/adminsortable2/edit_inline/stacked-django-${django_version}.html patches/stacked-django-${django_version}.patch
+          patch -p0 adminsortable2/templates/adminsortable2/edit_inline/tabular-django-${django_version}.html patches/tabular-django-${django_version}.patch
+        done
     - name: Build 🐍 Python 📦 Package
       run: python -m build --sdist --wheel --outdir dist/
     - name: Publish 🐍 Python 📦 Package to PyPI

.github/workflows/tests.yml

@@ -10,11 +10,12 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+
     strategy:
       matrix:
         python-version: ["3.8", "3.9", "3.10"]
-        Django-version: ["4.0"]
         node-version: ["16.x"]
+        django-version: ["4.0"]
 
     steps:
     - uses: actions/checkout@v3
@@ -31,10 +32,17 @@ jobs:
         npm ci --also=dev
         npx playwright install --with-deps
         python -m pip install --upgrade pip
-        python -m pip install "Django==${{ matrix.Django-version }}.*"
+        python -m pip install "Django==${{ matrix.django-version }}.*"
         python -m pip install -r testapp/requirements.txt
         python -m playwright install
         python -m playwright install-deps
+    - name: Patch templates
+      run: |
+        mkdir --parents adminsortable2/templates/adminsortable2/edit_inline
+        curl --output adminsortable2/templates/adminsortable2/edit_inline/stacked-django-${{ matrix.django-version }}.html https://raw.githubusercontent.com/django/django/stable/${{ matrix.django-version }}.x/django/contrib/admin/templates/admin/edit_inline/stacked.html
+        curl --output adminsortable2/templates/adminsortable2/edit_inline/tabular-django-${{ matrix.django-version }}.html https://raw.githubusercontent.com/django/django/stable/${{ matrix.django-version }}.x/django/contrib/admin/templates/admin/edit_inline/tabular.html
+        patch -p0 adminsortable2/templates/adminsortable2/edit_inline/stacked-django-${{ matrix.django-version }}.html patches/stacked-django-${{ matrix.django-version }}.patch
+        patch -p0 adminsortable2/templates/adminsortable2/edit_inline/tabular-django-${{ matrix.django-version }}.html patches/tabular-django-${{ matrix.django-version }}.patch
     - name: Build Client
       run: |
         npm run build

adminsortable2/admin.py

@@ -3,6 +3,7 @@
 from itertools import chain
 from types import MethodType
 
+from django import VERSION as DJANGO_VERSION
 from django.conf import settings
 from django.contrib import admin, messages
 from django.contrib.contenttypes.forms import BaseGenericInlineFormSet
@@ -498,6 +499,14 @@ def get_fields(self, *args, **kwargs):
         return fields
 
 
+class SortableStackedInline(admin.StackedInline):
+    template = 'adminsortable2/edit_inline/stacked-django-{0}.{1}.html'.format(*DJANGO_VERSION)
+
+
+class SortableTabularInline(admin.TabularInline):
+    template = 'adminsortable2/edit_inline/tabular-django-{0}.{1}.html'.format(*DJANGO_VERSION)
+
+
 class CustomGenericInlineFormSet(CustomInlineFormSetMixin, BaseGenericInlineFormSet):
     def get_max_order(self):
         query_set = self.model.objects.filter(

adminsortable2/templates/adminsortable2/edit_inline/stacked.html

@@ -0,0 +1,10 @@
+--- django/contrib/admin/templates/admin/edit_inline/stacked.html	2022-06-07 18:13:55.000000000 +0200
++++ adminsortable2/templates/adminsortable2/edit_inline/stacked.html	2022-06-10 09:55:47.000000000 +0200
+@@ -17,6 +17,7 @@
+ {% else %}#{{ forloop.counter }}{% endif %}</span>
+       {% if inline_admin_form.show_url %}<a href="{{ inline_admin_form.absolute_url }}">{% translate "View on site" %}</a>{% endif %}
+     {% if inline_admin_formset.formset.can_delete and inline_admin_formset.has_delete_permission and inline_admin_form.original %}<span class="delete">{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}</span>{% endif %}
++    {% if inline_admin_formset.has_change_permission and inline_admin_form.original %}<span class="sort"><i class="move-begin" role="button" aria-label="{% translate 'Move to first position' %}"></i><i class="move-end" role="button" aria-label="{% translate 'Move to last position' %}"></i></span>{% endif %}
+   </h3>
+   {% if inline_admin_form.form.non_field_errors %}{{ inline_admin_form.form.non_field_errors }}{% endif %}
+   {% for fieldset in inline_admin_form %}

adminsortable2/templates/adminsortable2/edit_inline/tabular.html

@@ -0,0 +1,10 @@
+--- django/contrib/admin/templates/admin/edit_inline/tabular.html	2022-06-07 18:13:55.000000000 +0200
++++ adminsortable2/templates/adminsortable2/edit_inline/tabular.html	2022-06-16 10:59:26.000000000 +0200
+@@ -36,6 +36,7 @@
+           {% 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="{% if inline_admin_formset.has_change_permission %}inlinechangelink{% else %}inlineviewlink{% endif %}">{% if inline_admin_formset.has_change_permission %}{% translate "Change" %}{% else %}{% translate "View" %}{% endif %}</a>{% endif %}
+           {% endif %}
+           {% if inline_admin_form.show_url %}<a href="{{ inline_admin_form.absolute_url }}">{% translate "View on site" %}</a>{% endif %}
++              <span class="sort"><i class="move-begin" role="button" aria-label="{% translate 'Move to first position' %}"></i><i class="move-end" role="button" aria-label="{% translate 'Move to last position' %}"></i></span>
+             </p>{% endif %}
+           {% if inline_admin_form.needs_explicit_pk_field %}{{ inline_admin_form.pk_field.field }}{% endif %}
+           {% if inline_admin_form.fk_field %}{{ inline_admin_form.fk_field.field }}{% endif %}

patches/stacked-django-4.0.patch

@@ -1,7 +1,7 @@
 from django.contrib import admin
 from django.template.response import TemplateResponse
 
-from adminsortable2.admin import SortableAdminBase, SortableAdminMixin, SortableInlineAdminMixin
+from adminsortable2.admin import SortableAdminBase, SortableAdminMixin, SortableInlineAdminMixin, SortableStackedInline, SortableTabularInline
 
 from testapp.models import Author, Chapter, Chapter1, Chapter2, Book, Book1, Book2
 
@@ -10,16 +10,14 @@ class AuthorAdmin(admin.ModelAdmin):
     list_display = ['name']
 
 
-class ChapterStackedInline(SortableInlineAdminMixin, admin.StackedInline):
+class ChapterStackedInline(SortableStackedInline):
     model = Chapter1  # model is ordered
     extra = 1
-    template = 'adminsortable2/edit_inline/stacked.html'
 
 
-class ChapterStackedInlineReversed(SortableInlineAdminMixin, admin.StackedInline):
+class ChapterStackedInlineReversed(SortableStackedInline):
     model = Chapter2  # model is reverse ordered
     extra = 1
-    template = 'adminsortable2/edit_inline/stacked.html'
 
 
 class ChapterStackedInlineUpOrdered(SortableInlineAdminMixin, admin.StackedInline):
@@ -34,10 +32,9 @@ class ChapterStackedInlineDownOrdered(SortableInlineAdminMixin, admin.StackedInl
     ordering = ['-my_order']
 
 
-class ChapterTabularInline(SortableInlineAdminMixin, admin.TabularInline):
+class ChapterTabularInline(SortableTabularInline):
     model = Chapter
     extra = 1
-    template = 'adminsortable2/edit_inline/tabular.html'
     ordering = ['my_order']