rc/aircox
13
1
Fork 1
Code Issues 15 Pull Requests Projects Releases Wiki Activity

#137: Sound et EpisodeSound, dashboard UI improvements (into #121) #138

Merged
thomas merged 10 commits from dev-1.0-137 into dev-1.0-121 2024-04-05 16:45:16 +00:00
Conversation 0 Commits 10 Files Changed 78 +783 -728
36 changed files with 783 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6bfcdd06c8 - Show all commits

5
aircox/models/sound.py
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

2
aircox/static/aircox/js/chunk-common.js
View File

File diff suppressed because one or more lines are too long

1
aircox/templates/aircox/dashboard/soundlist_editor.html
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 %}"

2
aircox/views/episode.py
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(

5
assets/src/components/ASelectFile.vue
View File

@ -18,7 +18,6 @@
</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"
@ -30,8 +29,8 @@
<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" v-show="panel == LIST" <div ref="list"
:class="['a-select-file-list', listClass]"> :class="['a-select-file-list', listClass]">
<!-- tiles --> <!-- tiles -->
<div v-if="prevUrl"> <div v-if="prevUrl">