diff --git a/vue3/src/components/dialogs/BatchDeleteDialog.vue b/vue3/src/components/dialogs/BatchDeleteDialog.vue
index 6aba1d2a6..5c8ad72ac 100644
--- a/vue3/src/components/dialogs/BatchDeleteDialog.vue
+++ b/vue3/src/components/dialogs/BatchDeleteDialog.vue
@@ -13,17 +13,17 @@
{{ $t('BatchDeleteConfirm') }}
-
- {{ genericModel.getLabel(i) }}
+
+ {{ genericModel.getLabel(item) }}
- {{$t('Error')}}
- {{$t('Deleted')}}
- {{$t('Waiting')}}
+
+
+
-
-
+
+
@@ -48,7 +48,7 @@ const emit = defineEmits(['change'])
const props = defineProps({
model: {type: String as PropType, required: true},
- items: {type: [] as PropType>, required: true},
+ items: {type: Array as PropType>, required: true},
activator: {type: String, default: 'parent'},
})
@@ -60,8 +60,8 @@ const loading = ref(false)
const genericModel = getGenericModelFromString(props.model, t)
const itemsToDelete = ref([])
-const deletedItems = ref([])
-const deletedErrored = ref([])
+const failedItems = ref([])
+const updatedItems = ref([])
watch(dialog, (newValue, oldValue) => {
if(!oldValue && newValue){
@@ -78,9 +78,9 @@ function deleteAll() {
itemsToDelete.value.forEach(item => {
promises.push(genericModel.destroy(item.id!).then((r: any) => {
- deletedItems.value.push(item)
+ updatedItems.value.push(item)
}).catch((err: any) => {
- deletedErrored.value.push(item)
+ failedItems.value.push(item)
}))
})
diff --git a/vue3/src/components/dialogs/ModelMergeDialog.vue b/vue3/src/components/dialogs/ModelMergeDialog.vue
index cdc87c932..4c9f77e05 100644
--- a/vue3/src/components/dialogs/ModelMergeDialog.vue
+++ b/vue3/src/components/dialogs/ModelMergeDialog.vue
@@ -3,26 +3,38 @@
- {{ $t('merge_selection', {source: genericModel.getLabel(props.source), type: $t(genericModel.model.localizationKey)}) }}
+ {{ $t('merge_selection', {source: sourceNames, type: $t(genericModel.model.localizationKey)}) }}
-
-
- {{ genericModel.getLabel(props.source) }}
-
-
-
- ?
- {{ genericModel.getLabel(target) }}
-
+
+
+
+ {{ genericModel.getLabel(item) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ?
+ {{ genericModel.getLabel(target) }}
+
+
@@ -40,7 +52,7 @@