From 0394093407b8590b7c8015eb8d3b62d6827f505b Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <DebaucheryLibrarian@unknown.name>
Date: Wed, 17 Jun 2026 00:10:25 +0200
Subject: [PATCH] Implemented row-level merge in actors admin panel.

---
 pages/admin/actors/+Page.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pages/admin/actors/+Page.vue b/pages/admin/actors/+Page.vue
index ac642e2..d8de870 100644
--- a/pages/admin/actors/+Page.vue
+++ b/pages/admin/actors/+Page.vue
@@ -88,13 +88,16 @@
 								v-tooltip="'Merge'"
 								icon="make-group"
 								class="actor-action action-merge"
+								@click="activeActor = actor; showMergeDialog = true;"
 							/>
 
+							<!--
 							<Icon
 								v-tooltip="'Delete'"
 								icon="bin"
 								class="actor-action action-delete"
 							/>
+							-->
 						</div>
 					</td>
 				</tr>
@@ -103,9 +106,8 @@
 
 		<Merge
 			v-if="showMergeDialog"
-			:actor="actors[0]"
-			:actors="actors.filter((actor) => selectedActors.has(actor.id))"
-			@close="showMergeDialog = false"
+			:actors="activeActor ? [activeActor] : actors.filter((actor) => selectedActors.has(actor.id))"
+			@close="showMergeDialog = false; activeActor = null;"
 		/>
 	</Admin>
 </template>
@@ -125,14 +127,13 @@ const { pageProps, urlParsed } = inject('pageContext');
 
 const actors = ref(pageProps.actors);
 const selectedActors = ref(new Set([]));
+const activeActor = ref(null);
 const actorQuery = ref(urlParsed.search.q || null);
 
 const lastSelectedIndex = ref(null);
 const holdingShift = ref(false);
 const showMergeDialog = ref(false);
 
-console.log(actors.value);
-
 function selectActors(selectedActor, isChecked, index) {
 	const [start, end] = holdingShift.value
 		? [index, lastSelectedIndex.value].toSorted((indexA, indexB) => indexA - indexB)