diff --git a/frontend/src/components/misc/CreateEdit.vue b/frontend/src/components/misc/CreateEdit.vue index 846b2f4bd..8031b114f 100644 --- a/frontend/src/components/misc/CreateEdit.vue +++ b/frontend/src/components/misc/CreateEdit.vue @@ -9,7 +9,7 @@ :shadow="false" :padding="false" class="has-text-start" - :loading="loading" + :loading="currentLoading" :show-close="true" @close="$router.back()" > @@ -37,8 +37,9 @@ v-if="hasPrimaryAction" variant="primary" :icon="primaryIcon" - :disabled="primaryDisabled || loading" + :disabled="isBusy" class="mis-2" + :loading="currentLoading" @click.prevent.stop="primary" > {{ primaryLabel || $t('misc.create') }} @@ -52,7 +53,9 @@ diff --git a/frontend/src/views/filters/FilterEdit.vue b/frontend/src/views/filters/FilterEdit.vue index 8ab6ab81c..330806b61 100644 --- a/frontend/src/views/filters/FilterEdit.vue +++ b/frontend/src/views/filters/FilterEdit.vue @@ -1,13 +1,14 @@