diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormAdd.vue index ddc0f4fcda..5ceaf3c778 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormAdd.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormAdd.vue @@ -126,7 +126,7 @@

{{ $__("Loading context...") }}

-
{{ alertMessage }}
+
{{ alertMessage }}
-
{{ alertMessage }}
+
{{ alertMessage }}
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormConfirmTriggerDelete.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormConfirmTriggerDelete.vue index 38aa1b8f50..1b2687b20a 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormConfirmTriggerDelete.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormConfirmTriggerDelete.vue @@ -33,7 +33,7 @@ }}

-
+
{{ alertMessage }}
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersList.vue index 6ded9bdcf7..42e2b6c37e 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersList.vue @@ -352,6 +352,7 @@ export default { allEffectiveRuleSets, librariesWithRules, storeInitialized, + metaInitialized, } = storeToRefs(circRulesStore); return { @@ -372,6 +373,7 @@ export default { isLastTrigger, getLibrariesWithRules, storeInitialized, + metaInitialized, from_branch, }; }, @@ -483,6 +485,19 @@ export default { this.$route.fullPath.includes("refresh") || this.$route.path.endsWith("circulation_triggers") ) { + if (!this.metaInitialized) { + await new Promise(resolve => { + const stop = this.$watch( + "metaInitialized", + val => { + if (val) { + stop(); + resolve(); + } + } + ); + }); + } await this.$nextTick(); await this.filterRuleSetsbySearchParam(); } diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/Main.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/Main.vue index 8c1b12f452..69fa7ac272 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/Main.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/Main.vue @@ -29,7 +29,7 @@ import { inject } from "vue"; export default { setup() { const circRulesStore = inject("circRulesStore"); - circRulesStore.init(); + circRulesStore.init(default_view); letters.unshift({ name: "No letter", code: "", @@ -51,6 +51,10 @@ export default {