From ed64b994924b6b616a35fb5381ffa0bf965a36e3 Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Wed, 23 Apr 2025 10:03:29 +0100 Subject: [PATCH] Bug 38010: (QA follow-up) UI fixes This patch addresses - Translation issues in VendorList - Removing the pagers from the contracts table - Removing redundant code from the vendors template file Signed-off-by: Michaela Sieber Signed-off-by: Jonathan Druart --- Koha/REST/V1/Acquisitions/Vendors.pm | 14 +++++++------- acqui/booksellers.pl | 2 +- .../prog/en/modules/acqui/booksellers.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/acqui/vendors.tt | 5 +---- .../js/vue/components/Vendors/VendorContracts.vue | 2 +- .../prog/js/vue/components/Vendors/VendorList.vue | 10 +++++++--- .../prog/js/vue/modules/acquisitions.ts | 2 +- 7 files changed, 20 insertions(+), 19 deletions(-) diff --git a/Koha/REST/V1/Acquisitions/Vendors.pm b/Koha/REST/V1/Acquisitions/Vendors.pm index 4f5fb17dae8..33157edfd95 100644 --- a/Koha/REST/V1/Acquisitions/Vendors.pm +++ b/Koha/REST/V1/Acquisitions/Vendors.pm @@ -85,13 +85,13 @@ Controller function that handles adding a new Koha::Acquisition::Bookseller obje sub add { my $c = shift->openapi->valid_input or return; - my $vendor = $c->req->json; - my $contacts = delete $vendor->{contacts}; - my $interfaces = delete $vendor->{interfaces}; - my $aliases = delete $vendor->{aliases}; - my $subscriptions = delete $vendor->{subscriptions}; - my $baskets = delete $vendor->{baskets}; - my $contracts = delete $vendor->{contracts}; + my $vendor = $c->req->json; + my $contacts = delete $vendor->{contacts}; + my $interfaces = delete $vendor->{interfaces}; + my $aliases = delete $vendor->{aliases}; + delete $vendor->{subscriptions}; + delete $vendor->{baskets}; + delete $vendor->{contracts}; my $vendor_to_store = Koha::Acquisition::Bookseller->new_from_api( $c->req->json ); diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl index 61890a66ac6..e4bcbaeaada 100755 --- a/acqui/booksellers.pl +++ b/acqui/booksellers.pl @@ -114,7 +114,7 @@ if ($booksellerid) { $template->param( loop_suppliers => $loop_suppliers, - supplier => $booksellerid, + booksellerid => $booksellerid, count => $vendor ? 1 : 0, ); $template->{VARS}->{'allbaskets'} = $allbaskets; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index 8aa135aa6f7..4e507b027ab 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -9,7 +9,7 @@ [% INCLUDE 'doc-head-open.inc' %] [% FILTER collapse %] - [% tx("Search for vendor {vendor}", { vendor = supplier }) | html %] + [% tx("Search for vendor {vendor}", { vendor = booksellerid }) | html %] › [% t("Koha") | html %] [% END %] @@ -32,7 +32,7 @@ Acquisitions [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Search for vendor [% supplier | html | $HtmlTags tag='em' %] + Search for vendor [% booksellerid | html | $HtmlTags tag='em' %] [% END %] [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendors.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendors.tt index 55f99acf296..d9242efd1fd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendors.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendors.tt @@ -21,7 +21,7 @@ [% INCLUDE 'acquisitions-search.inc' %] [% END %] -
+
[% MACRO jsinclude BLOCK %] @@ -40,9 +40,6 @@ [% Asset.js("js/vue/dist/acquisitions.js") | $raw %] [% INCLUDE 'select2.inc' %] - [% SET columns = ['cardnumber','name','category','branch','action'] %] - [% PROCESS patron_search_modal columns => columns, modal_title => t("Select user") %] - [% PROCESS patron_search_js columns => columns, filter => erm_users, actions => ["select"], preview_on_name_click => 1 %] [% END %] [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorContracts.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorContracts.vue index ce1916db5c8..30ac8c1f94a 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorContracts.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorContracts.vue @@ -44,7 +44,7 @@ export default { data: contracts, embed: [], ordering: false, - dom: '<"top pager"<"table_entries"ilp>>tr<"bottom pager"ip>', + dom: '<<"table_entries">>', aLengthMenu: [ [10, 20, 50, 100], [10, 20, 50, 100], diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue index a23208ea877..b59ff1c556c 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue @@ -246,7 +246,9 @@ export default { row.id + '" class="show">' + escape_str( - `${row.baskets.length} basket(s)` + __("%s basket(s)").format( + row.baskets.length + ) ) + "" : escape_str(__("No baskets")); @@ -260,11 +262,13 @@ export default { render(data, type, row, meta) { return row.subscriptions_count ? '' + escape_str( - `${row.subscriptions_count} subscription(s)` + __("%s subscription(s)").format( + row.subscriptions_count + ) ) + "" : escape_str(__("No subscriptions")); diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/modules/acquisitions.ts b/koha-tmpl/intranet-tmpl/prog/js/vue/modules/acquisitions.ts index e96f72ac383..2cc12a91657 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/modules/acquisitions.ts +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/modules/acquisitions.ts @@ -55,7 +55,7 @@ app.provide("mainStore", mainStore); app.provide("navigationStore", navigationStore); app.provide("permissionsStore", permissionsStore); -app.mount("#__vendors"); +app.mount("#vendors"); const { removeMessages } = mainStore; router.beforeEach((to, from) => { -- 2.34.1