fix copy

LycheeOrg · Nov 9, 2024 · 98ca856 · 98ca856
1 parent 36c96b9
commit 98ca856
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/resources/js/components/forms/photo/PhotoCopyDialog.vue b/resources/js/components/forms/photo/PhotoCopyDialog.vue
@@ -13,11 +13,11 @@
 				</div>
 			</div>
 			<div v-else>
-				<div class="p-9" v-if="error_no_target">
+				<div class="p-9" v-if="error_no_target === false">
 					<span class="font-bold">
 						{{ question }}
 					</span>
-					<SearchTargetAlbum :album-id="parentId" @selected="selected" @no-target="error_no_target = true" />
+					<SearchTargetAlbum :album-id="undefined" @selected="selected" @no-target="error_no_target = true" />
 				</div>
 				<div v-else class="p-9">
 					<p class="text-center text-muted-color">{{ "No album to copy to." }}</p>
@@ -96,14 +96,13 @@ function execute() {
 	PhotoService.copy(destination_id.value, photoCopiedIds).then(() => {
 		toast.add({
 			severity: "success",
-			summary: "Photo moved",
+			summary: "Photo copied",
 			life: 3000,
 		});
-		// Clear the cache for the current album and the destination album
+		// Clear the cache for the destination album
 		AlbumService.clearCache(destination_id.value);
 
 		emits("copy");
-		// Todo emit that we moved things.
 	});
 }
 </script>
diff --git a/resources/js/components/headers/AlbumHeader.vue b/resources/js/components/headers/AlbumHeader.vue
@@ -7,6 +7,7 @@
 		v-model:visible="isCreateAlbumOpen"
 		v-model:parent-id="props.album.id"
 		@close="isCreateAlbumOpen = false"
+		key="create_album_modal"
 	/>
 	<Toolbar class="w-full border-0 h-14" v-if="album">
 		<template #start>

diff --git a/resources/js/components/headers/AlbumsHeader.vue b/resources/js/components/headers/AlbumsHeader.vue
@@ -5,8 +5,8 @@
 	<ImportFromServer v-if="canUpload" v-model:visible="isImportFromServerOpen" />
 	<ImportFromLink v-if="canUpload" v-model:visible="isImportFromLinkOpen" :parent-id="null" />
 	<DropBox v-if="canUpload" v-model:visible="isImportFromDropboxOpen" :album-id="null" />
-	<AlbumCreateDialog v-if="canUpload" v-model:visible="isCreateAlbumOpen" :parent-id="null" />
-	<AlbumCreateTagDialog v-if="canUpload" v-model:visible="isCreateTagAlbumOpen" />
+	<AlbumCreateDialog v-if="canUpload" v-model:visible="isCreateAlbumOpen" :parent-id="null" key="create_album_modal" />
+	<AlbumCreateTagDialog v-if="canUpload" v-model:visible="isCreateTagAlbumOpen" key="create_tag_album_modal" />
 	<Toolbar
 		class="w-full border-0 h-14"
 		:pt:root:class="'flex-nowrap relative'"

diff --git a/resources/js/router/routes.ts b/resources/js/router/routes.ts
@@ -5,7 +5,7 @@ import Photo from "@/views/gallery-panels/Photo.vue";
 const Landing = () => import("@/views/Landing.vue");
 const Frame = () => import("@/views/gallery-panels/Frame.vue");
 const Search = () => import("@/views/gallery-panels/Search.vue");
-const Map = () => import("@/views/gallery-panels/Map.vue");
+const MapView = () => import("@/views/gallery-panels/Map.vue");
 const Permissions = () => import("@/views/Permissions.vue");
 const Users = () => import("@/views/Users.vue");
 const Sharing = () => import("@/views/Sharing.vue");
@@ -53,12 +53,12 @@ const routes_ = [
 	{
 		name: "map",
 		path: "/map",
-		component: Map,
+		component: MapView,
 	},
 	{
 		name: "map-with-album",
 		path: "/map/:albumid",
-		component: Map,
+		component: MapView,
 		props: true,
 	},
 	{