Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 24412: (follow-up) qa-tools

Browse source 
fix obvious problems:

    1. qa -c 8 -v 2
    2. should be green

Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Nicolas Legrand 2020-10-21 13:29:00 +02:00 committed by Jonathan Druart
parent 37f410a436
commit 22029a296b
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
koha-tmpl/intranet-tmpl/prog/js/holds.js
View file

@ -161,15 +161,15 @@ $(document).ready(function() {
if ( oObj.waiting_here ) {
data += __("Item is <strong>waiting here</strong>");
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 <strong>waiting</strong>");
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);
}
}

2
koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
View file

@ -100,7 +100,7 @@
<i class="fa fa-exclamation-circle text-warning" aria-hidden="true"></i>
[% IF ( HOLD.is_at_destination ) %]
Item waiting at <strong> [% HOLD.branch.branchname | html %]</strong>
[% 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 %]

8
t/db_dependent/Koha/Holds.t
View file

@ -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(
{