From 9c4bd081dadf32042910b1072419dbef0d915901 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 11 Apr 2023 21:14:25 +0200 Subject: [PATCH] Bug 33483: Restore 'select' We are not supposed to see edit and delete buttons, but select instead, to pick an agreement. Regression introduced by commit 809f90d394fdef8142fdf8f4a6e825dc14a132d4 Bug 33066: Remove build_datatable Signed-off-by: Jonathan Druart Signed-off-by: Pedro Amorim Signed-off-by: Martin Renvoize --- .../js/vue/components/ERM/AgreementsList.vue | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue index 75a1671875..3ebd9400d7 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue @@ -39,6 +39,7 @@ @show="doShow" @edit="doEdit" @delete="doDelete" + @select="doSelect" >
@@ -127,7 +128,16 @@ export default { }, actions: { 0: ["show"], - "-1": ["edit", "delete"], + "-1": this.embedded + ? [ + { + select: { + text: this.$__("Select"), + icon: "fa fa-check", + }, + }, + ] + : ["edit", "delete"], }, default_filters: { "user_roles.user_id": function () { @@ -192,6 +202,10 @@ export default { } ) }, + doSelect: function (agreement, dt, event) { + this.$emit("select-agreement", agreement.agreement_id) + this.$emit("close") + }, table_url: function () { let url = "/api/v1/erm/agreements" if (this.filters.by_expired) @@ -199,10 +213,6 @@ export default { "?max_expiration_date=" + this.filters.max_expiration_date return url }, - select_agreement: function (agreement_id) { - this.$emit("select-agreement", agreement_id) - this.$emit("close") - }, filter_table: async function () { if (!embedded) { let new_route = build_url( -- 2.40.0