Skip to content

Commit b9db94e

Browse files
committed
use patch files to create Django’s edit_inline templates
1 parent 54ed954 commit b9db94e

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

.github/workflows/publish.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: deploy
1717

1818
env:
19-
DJANGO_VERSIONS: ["4.0"]
19+
DJANGO_VERSIONS: [4.0, 4.1]
2020

2121
strategy:
2222
matrix:
@@ -42,14 +42,18 @@ jobs:
4242
run: |
4343
npm run build
4444
npm run uglify
45-
-name: Patch templates
45+
- name: Patch templates
4646
run: |
4747
mkdir --parents adminsortable2/templates/adminsortable2/edit_inline
48-
for django_version in $DJANGO_VERSIONS; do
49-
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
50-
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
51-
patch -p0 adminsortable2/templates/adminsortable2/edit_inline/stacked-django-${django_version}.html patches/stacked-django-${django_version}.patch
52-
patch -p0 adminsortable2/templates/adminsortable2/edit_inline/tabular-django-${django_version}.html patches/tabular-django-${django_version}.patch
48+
echo ${DJANGO_VERSIONS[*]}
49+
echo ${{ env.DJANGO_VERSIONS[*] }}
50+
echo ${{ env.DJANGO_VERSIONS }}
51+
for django_version in ${DJANGO_VERSIONS[*]}; do
52+
echo $django_version
53+
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
54+
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
55+
patch -p0 adminsortable2/templates/adminsortable2/edit_inline/stacked-django-$django_version.html patches/stacked-django-$django_version.patch
56+
patch -p0 adminsortable2/templates/adminsortable2/edit_inline/tabular-django-$django_version.html patches/tabular-django-$django_version.patch
5357
done
5458
- name: Build 🐍 Python 📦 Package
5559
run: python -m build --sdist --wheel --outdir dist/

adminsortable2/admin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,11 +499,11 @@ def get_fields(self, *args, **kwargs):
499499
return fields
500500

501501

502-
class SortableStackedInline(admin.StackedInline):
502+
class SortableStackedInline(SortableInlineAdminMixin, admin.StackedInline):
503503
template = 'adminsortable2/edit_inline/stacked-django-{0}.{1}.html'.format(*DJANGO_VERSION)
504504

505505

506-
class SortableTabularInline(admin.TabularInline):
506+
class SortableTabularInline(SortableInlineAdminMixin, admin.TabularInline):
507507
template = 'adminsortable2/edit_inline/tabular-django-{0}.{1}.html'.format(*DJANGO_VERSION)
508508

509509

0 commit comments

Comments
 (0)