@@ -, +, @@
1. qa -c 6 -v 2
2. should be green
---
koha-tmpl/intranet-tmpl/prog/js/holds.js | 12 ++++++------
koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc | 2 +-
t/db_dependent/Koha/Holds.t | 10 +++++-----
3 files changed, 12 insertions(+), 12 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/js/holds.js
+++ a/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);
+ }
}
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
+++ a/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 %]
--- a/t/db_dependent/Koha/Holds.t
+++ a/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(
{
@@ -405,7 +405,7 @@ subtest 'Desks' => sub {
$hold->set_waiting($desk->desk_id);
is($hold->found, 'W', 'Hold is waiting with correct status set');
is($hold->desk_id, $desk->desk_id, 'Hold is attach to its desk');
-
+
};
$schema->storage->txn_rollback;
--