瀏覽代碼

fix: report modal wouldn't always show when activating from EditSong Musare search item report button

Kristian Vos 3 年之前
父節點
當前提交
6d54887842

+ 4 - 0
frontend/src/pages/Admin/tabs/HiddenSongs.vue

@@ -114,6 +114,7 @@
 		</div>
 		<import-album v-if="modals.importAlbum" />
 		<edit-song v-if="modals.editSong" song-type="songs" :key="song._id" />
+		<report v-if="modals.report" />
 		<request-song v-if="modals.requestSong" />
 		<floating-box
 			id="keyboardShortcutsHelper"
@@ -195,6 +196,9 @@ export default {
 		EditSong: defineAsyncComponent(() =>
 			import("@/components/modals/EditSong")
 		),
+		Report: defineAsyncComponent(() =>
+			import("@/components/modals/Report.vue")
+		),
 		ImportAlbum: defineAsyncComponent(() =>
 			import("@/components/modals/ImportAlbum.vue")
 		),

+ 1 - 1
frontend/src/pages/Admin/tabs/Playlists.vue

@@ -84,8 +84,8 @@
 		</div>
 
 		<edit-playlist v-if="modals.editPlaylist" sector="admin" />
-		<report v-if="modals.report" />
 		<edit-song v-if="modals.editSong" song-type="songs" />
+		<report v-if="modals.report" />
 	</div>
 </template>
 

+ 4 - 1
frontend/src/pages/Admin/tabs/Reports.vue

@@ -79,8 +79,8 @@
 		</div>
 
 		<view-report v-if="modals.viewReport" sector="admin" />
-
 		<edit-song v-if="modals.editSong" song-type="songs" />
+		<report v-if="modals.report" />
 	</div>
 </template>
 
@@ -98,6 +98,9 @@ export default {
 		ViewReport: defineAsyncComponent(() =>
 			import("@/components/modals/ViewReport.vue")
 		),
+		Report: defineAsyncComponent(() =>
+			import("@/components/modals/Report.vue")
+		),
 		EditSong: defineAsyncComponent(() =>
 			import("@/components/modals/EditSong/index.vue")
 		),

+ 1 - 1
frontend/src/pages/Admin/tabs/Stations.vue

@@ -186,8 +186,8 @@
 			:station-id="editingStationId"
 			sector="admin"
 		/>
-		<report v-if="modals.report" />
 		<edit-song v-if="modals.editSong" song-type="songs" sector="admin" />
+		<report v-if="modals.report" />
 	</div>
 </template>
 

+ 4 - 0
frontend/src/pages/Admin/tabs/UnverifiedSongs.vue

@@ -128,6 +128,7 @@
 		</div>
 		<import-album v-if="modals.importAlbum" />
 		<edit-song v-if="modals.editSong" song-type="songs" :key="song._id" />
+		<report v-if="modals.report" />
 		<request-song v-if="modals.requestSong" />
 		<floating-box
 			id="keyboardShortcutsHelper"
@@ -212,6 +213,9 @@ export default {
 		EditSong: defineAsyncComponent(() =>
 			import("@/components/modals/EditSong")
 		),
+		Report: defineAsyncComponent(() =>
+			import("@/components/modals/Report.vue")
+		),
 		ImportAlbum: defineAsyncComponent(() =>
 			import("@/components/modals/ImportAlbum.vue")
 		),

+ 4 - 0
frontend/src/pages/Admin/tabs/VerifiedSongs.vue

@@ -159,6 +159,7 @@
 		</div>
 		<import-album v-if="modals.importAlbum" />
 		<edit-song v-if="modals.editSong" song-type="songs" :key="song._id" />
+		<report v-if="modals.report" />
 		<request-song v-if="modals.requestSong" />
 		<floating-box
 			id="keyboardShortcutsHelper"
@@ -258,6 +259,9 @@ export default {
 		EditSong: defineAsyncComponent(() =>
 			import("@/components/modals/EditSong")
 		),
+		Report: defineAsyncComponent(() =>
+			import("@/components/modals/Report.vue")
+		),
 		ImportAlbum: defineAsyncComponent(() =>
 			import("@/components/modals/ImportAlbum.vue")
 		),

+ 1 - 1
frontend/src/pages/Profile/index.vue

@@ -1,9 +1,9 @@
 <template>
 	<div v-if="isUser">
 		<edit-playlist v-if="modals.editPlaylist" />
-		<report v-if="modals.report" />
 		<view-report v-if="modals.viewReport" />
 		<edit-song v-if="modals.editSong" song-type="songs" />
+		<report v-if="modals.report" />
 
 		<page-metadata :title="`Profile | ${user.username}`" />
 		<main-header />

+ 5 - 2
frontend/src/pages/Station/index.vue

@@ -699,14 +699,17 @@
 					:station-id="station._id"
 					sector="station"
 				/>
+				<edit-song
+					v-if="modals.editSong"
+					song-type="songs"
+					sector="station"
+				/>
 				<report v-if="modals.report" />
 			</div>
 
 			<main-footer />
 		</div>
 
-		<edit-song v-if="modals.editSong" song-type="songs" sector="station" />
-
 		<floating-box id="player-debug-box" ref="playerDebugBox">
 			<template #body>
 				<span><b>No song</b>: {{ noSong }}</span>