diff --git a/Koha/REST/V1/CirculationRules.pm b/Koha/REST/V1/CirculationRules.pm index c7740e6aa6..3039708599 100644 --- a/Koha/REST/V1/CirculationRules.pm +++ b/Koha/REST/V1/CirculationRules.pm @@ -121,7 +121,7 @@ sub list_rules { { path => '/query/rules', values => { - uri => '/api/v1/kinds', + uri => '/api/v1/circulation_rules/kinds', field => 'rule_name' } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/circulation_triggers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/circulation_triggers.tt index 515b8ce425..5468363523 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/circulation_triggers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/circulation_triggers.tt @@ -30,11 +30,12 @@ [% INCLUDE 'datatables.inc' %] [% INCLUDE 'js-date-format.inc' %] + [% Asset.js("js/vue/dist/admin/circulation_triggers.js") | $raw %] [% END %] 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 ef47ece3ea..a092d116c1 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 @@ -34,7 +34,7 @@ :editMode="editMode" :canManageAnyLibrary="canManageAnyLibrary" :libraries="libraries" - :logged_in_library_id="logged_in_library_id" + :user_library_id="user_library_id" :patronCategories="patronCategories" :itemTypes="itemTypes" /> @@ -147,7 +147,7 @@ export default { lastEditedTriggerNumber, storeInitialized, canManageAnyLibrary, - logged_in_library_id, + user_library_id, } = storeToRefs(circRulesStore); return { @@ -166,7 +166,7 @@ export default { lastEditedTriggerNumber, storeInitialized, canManageAnyLibrary, - logged_in_library_id, + user_library_id, compareByProperty, scrollToElementById, }; @@ -332,8 +332,9 @@ export default { this.triggerNumber ) ) { - this.alertMessage = - "Your changes could not be saved as this circulation trigger was updated elsewhere. Please see the updated trigger below."; + this.alertMessage = this.$__( + "Your changes could not be saved as this circulation trigger was updated elsewhere. Please see the updated trigger below." + ); this.$router.push({ path: "/cgi-bin/koha/admin/circulation_triggers/edit", query: { @@ -380,8 +381,8 @@ export default { this.ruleSetInitialized = true; }, setContext(query) { - if (!this.canManageAnyLibrary && this.logged_in_library_id) { - this.context.library_id = this.logged_in_library_id; + if (!this.canManageAnyLibrary && this.user_library_id) { + this.context.library_id = this.user_library_id; } else { this.context.library_id = query.library_id ?? "*"; } diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormConfirmReset.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormConfirmReset.vue index 74fcfd3268..6a3041529d 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormConfirmReset.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Admin/CirculationTriggers/CirculationTriggersFormConfirmReset.vue @@ -1,8 +1,8 @@