From 22029a296bb6f2581fead171cf98f4410ef4acb2 Mon Sep 17 00:00:00 2001 From: Nicolas Legrand Date: Wed, 21 Oct 2020 13:29:00 +0200 Subject: [PATCH] Bug 24412: (follow-up) qa-tools MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit fix obvious problems: 1. qa -c 8 -v 2 2. should be green Signed-off-by: Séverine QUEUNE Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart --- koha-tmpl/intranet-tmpl/prog/js/holds.js | 12 ++++++------ .../opac-tmpl/bootstrap/en/includes/holds-table.inc | 2 +- t/db_dependent/Koha/Holds.t | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/holds.js b/koha-tmpl/intranet-tmpl/prog/js/holds.js index 59dcfd893a..be94430d88 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/holds.js +++ b/koha-tmpl/intranet-tmpl/prog/js/holds.js @@ -161,15 +161,15 @@ $(document).ready(function() { if ( oObj.waiting_here ) { data += __("Item is waiting here"); - if (oObj.desk_name) { - data += ", " + __("at %s").format( oObj.desk_name ); - } + if (oObj.desk_name) { + data += ", " + __("at %s").format(oObj.desk_name); + } } else { data += __("Item is waiting"); data += " " + __("at %s").format(oObj.waiting_at); - if (oObj.desk_name) { - data += ", " + __("at %s").format( oObj.desk_name ); - } + if (oObj.desk_name) { + data += ", " + __("at %s").format(oObj.desk_name); + } } diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc index b4068f306e..dd5736de7d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc @@ -100,7 +100,7 @@ [% IF ( HOLD.is_at_destination ) %] Item waiting at [% HOLD.branch.branchname | html %] - [% IF ( HOLD.desk_id ) %], [% Desks.GetName ( HOLD.desk_id ) | html %],[% END %] + [% IF ( HOLD.desk_id ) %], [% Desks.GetName ( HOLD.desk_id ) | html %],[% END %] [% IF ( HOLD.waitingdate ) %] since [% HOLD.waitingdate | $KohaDates %] [% IF HOLD.expirationdate %] diff --git a/t/db_dependent/Koha/Holds.t b/t/db_dependent/Koha/Holds.t index cc61fc04e3..538e7119de 100755 --- a/t/db_dependent/Koha/Holds.t +++ b/t/db_dependent/Koha/Holds.t @@ -373,9 +373,9 @@ subtest 'Desks' => sub { my $library = $builder->build_object( { class => 'Koha::Libraries' } ); my $desk = Koha::Desk->new({ - desk_name => 'my_desk_name_for_test', - branchcode => $library->branchcode , - })->store; + desk_name => 'my_desk_name_for_test', + branchcode => $library->branchcode , + })->store; ok($desk, "Desk created"); my $item = $builder->build_sample_item({ library => $library->branchcode }); my $manager = $builder->build_object( { class => "Koha::Patrons" } ); @@ -386,7 +386,7 @@ subtest 'Desks' => sub { class => 'Koha::Patrons', value => { branchcode => $library->branchcode, } } - ); + ); my $reserve_id = C4::Reserves::AddReserve( { -- 2.39.5