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 <michaela.sieber@kit.edu>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>

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 );
 

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;

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt

@@ -9,7 +9,7 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title
     >[% FILTER collapse %]
-        [% tx("Search for vendor {vendor}", { vendor = supplier }) | html %]
+        [% tx("Search for vendor {vendor}", { vendor = booksellerid }) | html %]
         &rsaquo; [% t("Koha") | html %]
     [% END %]</title
 >
@@ -32,7 +32,7 @@
             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
         [% END %]
         [% WRAPPER breadcrumb_item bc_active= 1 %]
-            <span>Search for vendor [% supplier | html | $HtmlTags tag='em' %]</span>
+            <span>Search for vendor [% booksellerid | html | $HtmlTags tag='em' %]</span>
         [% END %]
     [% END #/ WRAPPER breadcrumbs %]
 [% END #/ WRAPPER sub-header.inc %]

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendors.tt

@@ -21,7 +21,7 @@
     [% INCLUDE 'acquisitions-search.inc' %]
 [% END %]
 
-<div id="__vendors">
+<div id="vendors">
     <!-- this is closed in intranet-bottom.inc -->
 
     [% MACRO jsinclude BLOCK %]
@@ -40,9 +40,6 @@
         </script>
         [% 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' %]</div
 >

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],

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
+                                      )
                                   ) +
                                   "</a>"
                             : escape_str(__("No baskets"));
@@ -260,11 +262,13 @@ export default {
                     render(data, type, row, meta) {
                         return row.subscriptions_count
                             ? '<a href="/cgi-bin/koha/serials/serials-search.pl?bookseller_filter=' +
-                                  row.name +
+                                  escape_str(row.name) +
                                   "&searched=1" +
                                   '" class="show">' +
                                   escape_str(
-                                      `${row.subscriptions_count} subscription(s)`
+                                      __("%s subscription(s)").format(
+                                          row.subscriptions_count
+                                      )
                                   ) +
                                   "</a>"
                             : escape_str(__("No subscriptions"));

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) => {