diff --git a/aircox/admin/episode.py b/aircox/admin/episode.py index e255cab..e2f1a66 100644 --- a/aircox/admin/episode.py +++ b/aircox/admin/episode.py @@ -3,6 +3,7 @@ from copy import copy from django.contrib import admin from django.forms import ModelForm from django.utils.translation import gettext as _ +from adminsortable2.admin import SortableAdminBase from ..models import Episode, Diffusion @@ -56,7 +57,7 @@ class EpisodeAdminForm(ModelForm): @admin.register(Episode) -class EpisodeAdmin(PageAdmin): +class EpisodeAdmin(SortableAdminBase, PageAdmin): form = EpisodeAdminForm list_display = PageAdmin.list_display list_filter = tuple(f for f in PageAdmin.list_filter if f != 'pub_date') + \ diff --git a/aircox/admin/sound.py b/aircox/admin/sound.py index 34012de..1a4b515 100644 --- a/aircox/admin/sound.py +++ b/aircox/admin/sound.py @@ -4,7 +4,7 @@ from django.contrib import admin from django.utils.safestring import mark_safe from django.utils.translation import gettext_lazy as _ -from adminsortable2.admin import SortableInlineAdminMixin +from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin from ..models import Sound, Track @@ -38,7 +38,7 @@ class SoundInline(admin.TabularInline): @admin.register(Sound) -class SoundAdmin(admin.ModelAdmin): +class SoundAdmin(SortableAdminBase, admin.ModelAdmin): fields = None list_display = ['id', 'name', 'related', 'type', 'duration', 'is_public', 'is_good_quality', diff --git a/aircox/admin/station.py b/aircox/admin/station.py index 341f288..41cedec 100644 --- a/aircox/admin/station.py +++ b/aircox/admin/station.py @@ -1,4 +1,5 @@ from django.contrib import admin +from adminsortable2.admin import SortableAdminBase from ..models import Port, Station from .page import NavItemInline @@ -13,7 +14,7 @@ class PortInline(admin.StackedInline): @admin.register(Station) -class StationAdmin(admin.ModelAdmin): +class StationAdmin(SortableAdminBase, admin.ModelAdmin): prepopulated_fields = {'slug': ('name',)} inlines = (PortInline, NavItemInline) diff --git a/aircox/templates/admin/aircox/playlist_inline.html b/aircox/templates/admin/aircox/playlist_inline.html index cf83872..64eb789 100644 --- a/aircox/templates/admin/aircox/playlist_inline.html +++ b/aircox/templates/admin/aircox/playlist_inline.html @@ -2,6 +2,6 @@ {% load static i18n %} {% with inline_admin_formset.formset.instance as playlist %} -{% include "adminsortable2/tabular.html" %} +{% include "adminsortable2/edit_inline/tabular-django-4.1.html" %} {% endwith %} diff --git a/requirements.txt b/requirements.txt index 58ee787..8b446a9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ django-filter~=22.1 django-filer~=2.2 django-honeypot~=1.0 django-taggit~=3.0 -django-admin-sortable2~=2.2 +django-admin-sortable2~=2.1 django-ckeditor~=6.4 bleach~=5.0 easy-thumbnails~=2.8