diff --git a/components/actors/merge.vue b/components/actors/merge.vue
index fa60c54..5db0ab0 100644
--- a/components/actors/merge.vue
+++ b/components/actors/merge.vue
@@ -3,7 +3,33 @@
:title="`Merge '${actor.name}'`"
@close="emit('close')"
>
-
+
+
+
#{{ actor.id }} {{ actor.name }} ({{ actor.entity.name }})
merging into
@@ -87,13 +113,14 @@ const props = defineProps({
},
});
-const emit = defineEmits(['close']);
+const emit = defineEmits(['close', 'merged']);
const targetActor = ref(null);
const actorInput = ref(null);
const actorQuery = ref('');
const actorResults = ref([]);
const submitted = ref(false);
+const merged = ref(false);
async function searchActors() {
const res = await get('/actors', {
@@ -115,8 +142,11 @@ async function merge() {
});
submitted.value = false;
+ merged.value = true;
- emit('close');
+ emit('merged');
+
+ // emit('close');
}
function selectActor(actor) {
@@ -201,4 +231,10 @@ onMounted(() => {
box-sizing: border-box;
padding: 0 1rem;
}
+
+.options {
+ padding: 0 1.5rem;
+ margin: 0;
+ line-height: 1.75;
+}