From 989959f5e3f98949a1e0da36b25912f613a58e01 Mon Sep 17 00:00:00 2001
From: Petitminion <petitminion@riseup.net>
Date: Sat, 12 Apr 2025 16:33:37 +0200
Subject: [PATCH] fix:(front/back): revert last commit change and pass
 baseImportMetadata to fileuploadwidget

---
 api/funkwhale_api/music/views.py             | 5 +----
 front/src/components/channels/UploadForm.vue | 9 ++++++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/api/funkwhale_api/music/views.py b/api/funkwhale_api/music/views.py
index 8ec60e0e2..ba9336037 100644
--- a/api/funkwhale_api/music/views.py
+++ b/api/funkwhale_api/music/views.py
@@ -768,10 +768,7 @@ class UploadViewSet(
             # prevent updating an upload that is already processed
             qs = qs.filter(import_status="draft")
         if self.action != "retrieve":
-            qs = qs.filter(
-                Q(library__actor=self.request.user.actor)
-                | Q(library__channel__actor=self.request.user.actor)
-            )
+            qs = qs.filter(library__actor=self.request.user.actor)
         else:
             actor = utils.get_actor_from_request(self.request)
             qs = qs.playable_by(actor)
diff --git a/front/src/components/channels/UploadForm.vue b/front/src/components/channels/UploadForm.vue
index 40c47ed5f..a2fcbba0d 100644
--- a/front/src/components/channels/UploadForm.vue
+++ b/front/src/components/channels/UploadForm.vue
@@ -291,6 +291,13 @@ const uploadedFilesById = computed(() => uploadedFiles.value.reduce((acc: Record
 //
 // Metadata
 //
+
+const baseImportMetadata = computed(() => ({
+  channel: values.channel,
+  import_status: 'draft',
+  import_metadata: { license: values.license, album: values.album }
+}))
+
 type Metadata = Pick<Track, 'title' | 'position' | 'tags'> & { cover: string | null, description: string }
 const uploadImportData = reactive({} as Record<string, Metadata>)
 const audioMetadata = reactive({} as Record<string, Record<string, string>>)
@@ -419,7 +426,6 @@ const publish = async () => {
   isLoading.value = true
 
   errors.value = []
-
   try {
     // Post list of uuids of uploadedFiles to axios action:publish
 
@@ -647,6 +653,7 @@ defineExpose({
       v-model="files"
       :class="['ui', 'button', 'channels']"
       :channel="selectedChannel.uuid"
+      :data="baseImportMetadata"
       @input-file="beforeFileUpload"
     >
       <div>