From 68c13ca598469e018a7da2eebef1bd94e3c1e44c Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 7 Mar 2023 15:42:48 +0100 Subject: [PATCH] Bug 33066: Embed vendor and retrieve vendor name from the request --- .../prog/js/vue/components/ERM/AgreementsList.vue | 9 ++------- .../intranet-tmpl/prog/js/vue/components/KohaTable.vue | 1 + 2 files changed, 3 insertions(+), 7 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 502f7ac489c..2180fe85de5 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 @@ -85,6 +85,7 @@ export default { building_table: false, tableOptions: { columns: this.getTableColumns(), + options: { embed: "vendor" }, url: () => this.table_url(), table_settings: this.agreement_table_settings, add_filters: true, @@ -202,10 +203,6 @@ export default { getTableColumns: function () { let get_lib_from_av = this.get_lib_from_av let escape_str = this.escape_str - let vendors_map = this.vendors.reduce((map, e) => { - map[e.id] = e - return map - }, {}) return [ { @@ -229,9 +226,7 @@ export default { searchable: true, orderable: true, render: function (data, type, row, meta) { - return row.vendor_id != undefined - ? row.vendor_id //escape_str(vendors_map[row.vendor_id].name) - : "" + return row.vendor_id != undefined ? row.vendor.name : "" }, }, { diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/KohaTable.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/KohaTable.vue index 2e0173e1a2f..7c53c9bdf5e 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/KohaTable.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/KohaTable.vue @@ -46,6 +46,7 @@ export default { }, buttons, default_search: this.$route.query.q, + ...this.options, }, hidden_ids, included_ids, -- 2.25.1