ctactic/aircox-radiocampus
1
0
Fork 0
forked from rc/aircox
Code Issues 10 Pull Requests Activity

Merge pull request '#64: erreur apres upgrade a django4 / admin-sortable2 2.0+' (#66) from fix-1.0-64 into develop-1.0

Browse Source 
Reviewed-on: rc/aircox#66
This commit is contained in:
Thomas Kairos 2022-08-16 13:46:58 +02:00
commit aad15891b0
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
aircox/admin/episode.py
View File

@ -3,6 +3,7 @@ from copy import copy
from django.contrib import admin from django.contrib import admin
from django.forms import ModelForm from django.forms import ModelForm
from django.utils.translation import gettext as _ from django.utils.translation import gettext as _
from adminsortable2.admin import SortableAdminBase
from ..models import Episode, Diffusion from ..models import Episode, Diffusion
@ -56,7 +57,7 @@ class EpisodeAdminForm(ModelForm):
@admin.register(Episode) @admin.register(Episode)
class EpisodeAdmin(PageAdmin): class EpisodeAdmin(SortableAdminBase, PageAdmin):
form = EpisodeAdminForm form = EpisodeAdminForm
list_display = PageAdmin.list_display list_display = PageAdmin.list_display
list_filter = tuple(f for f in PageAdmin.list_filter if f != 'pub_date') + \ list_filter = tuple(f for f in PageAdmin.list_filter if f != 'pub_date') + \

4
aircox/admin/sound.py
View File

@ -4,7 +4,7 @@ from django.contrib import admin
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from adminsortable2.admin import SortableInlineAdminMixin from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin
from ..models import Sound, Track from ..models import Sound, Track
@ -38,7 +38,7 @@ class SoundInline(admin.TabularInline):
@admin.register(Sound) @admin.register(Sound)
class SoundAdmin(admin.ModelAdmin): class SoundAdmin(SortableAdminBase, admin.ModelAdmin):
fields = None fields = None
list_display = ['id', 'name', 'related', list_display = ['id', 'name', 'related',
'type', 'duration', 'is_public', 'is_good_quality', 'type', 'duration', 'is_public', 'is_good_quality',

3
aircox/admin/station.py
View File

@ -1,4 +1,5 @@
from django.contrib import admin from django.contrib import admin
from adminsortable2.admin import SortableAdminBase
from ..models import Port, Station from ..models import Port, Station
from .page import NavItemInline from .page import NavItemInline
@ -13,7 +14,7 @@ class PortInline(admin.StackedInline):
@admin.register(Station) @admin.register(Station)
class StationAdmin(admin.ModelAdmin): class StationAdmin(SortableAdminBase, admin.ModelAdmin):
prepopulated_fields = {'slug': ('name',)} prepopulated_fields = {'slug': ('name',)}
inlines = (PortInline, NavItemInline) inlines = (PortInline, NavItemInline)

2
requirements.txt
View File

@ -6,7 +6,7 @@ django-filter~=22.1
django-filer~=2.2 django-filer~=2.2
django-honeypot~=1.0 django-honeypot~=1.0
django-taggit~=3.0 django-taggit~=3.0
django-admin-sortable2~=2.2 django-admin-sortable2~=2.1
django-ckeditor~=6.4 django-ckeditor~=6.4
bleach~=5.0 bleach~=5.0
easy-thumbnails~=2.8 easy-thumbnails~=2.8