create EpisodeSound & adapt; update list editors

This commit is contained in:
bkfox 2024-03-26 17:47:32 +01:00
parent 78a8478da8
commit 6bfcdd06c8
5 changed files with 18 additions and 19 deletions

View File

@ -12,8 +12,6 @@ from aircox.conf import settings
from .program import Program from .program import Program
from .file import File, FileQuerySet from .file import File, FileQuerySet
from .track import Track
from .controllers.playlist_import import PlaylistImport
__all__ = ("Sound", "SoundQuerySet") __all__ = ("Sound", "SoundQuerySet")
@ -133,6 +131,9 @@ class Sound(File):
Use provided sound's metadata if any and no csv file has been Use provided sound's metadata if any and no csv file has been
found. found.
""" """
from aircox.controllers.playlist_import import PlaylistImport
from .track import Track
if self.track_set.count() > 1: if self.track_set.count() > 1:
return return

File diff suppressed because one or more lines are too long

View File

@ -17,7 +17,6 @@ Context:
{% block tag-attrs %} {% block tag-attrs %}
{{ block.super }} {{ block.super }}
list-url="{% url "api:episodesound-list" %}"
sound-list-url="{% url "api:sound-list" %}?program={{ object.parent_id }}" sound-list-url="{% url "api:sound-list" %}?program={{ object.parent_id }}"
sound-upload-url="{% url "api:sound-list" %}" sound-upload-url="{% url "api:sound-list" %}"
sound-delete-url="{% url "api:sound-detail" pk=123 %}" sound-delete-url="{% url "api:sound-detail" pk=123 %}"

View File

@ -73,7 +73,7 @@ class EpisodeUpdateView(UserPassesTestMixin, BaseProgramMixin, PageUpdateView):
return forms.TrackFormSet(**kwargs) return forms.TrackFormSet(**kwargs)
def get_soundlist_queryset(self, episode): def get_soundlist_queryset(self, episode):
return episode.episodesound_set.all().select_related("sound").order_by("-broadcast", "position") return episode.episodesound_set.all().select_related("sound").order_by("position")
def get_soundlist_formset(self, episode, **kwargs): def get_soundlist_formset(self, episode, **kwargs):
kwargs.update( kwargs.update(

View File

@ -18,20 +18,19 @@
</button> </button>
</template> </template>
<template #default> <template #default>
<div class="a-select-file"> <a-file-upload ref="upload" v-if="panel == UPLOAD"
<a-file-upload ref="upload" v-if="panel == UPLOAD" :url="uploadUrl"
:url="uploadUrl" :label="uploadLabel" :field-name="uploadFieldName"
:label="uploadLabel" :field-name="uploadFieldName" @load="uploadDone">
@load="uploadDone"> <template #form="data">
<template #form="data"> <slot name="upload-form" v-bind="data"></slot>
<slot name="upload-form" v-bind="data"></slot> </template>
</template> <template #preview="data">
<template #preview="data"> <slot name="upload-preview" v-bind="data"></slot>
<slot name="upload-preview" v-bind="data"></slot> </template>
</template> </a-file-upload>
</a-file-upload> <div class="a-select-file" v-else>
<div ref="list"
<div ref="list" v-show="panel == LIST"
:class="['a-select-file-list', listClass]"> :class="['a-select-file-list', listClass]">
<!-- tiles --> <!-- tiles -->
<div v-if="prevUrl"> <div v-if="prevUrl">