Attachment 112171 Details for Bug 24412 – Bug 24412: (follow-up) qa-tools

[patch] Bug 24412: (follow-up) qa-tools

Bug-24412-follow-up-qa-tools.patch (text/plain), 4.05 KB, created by Nicolas Legrand on 2020-10-22 11:40:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolas Legrand

Created: 2020-10-22 11:40:16 UTC

Size: 4.05 KB

patch

obsolete

>From 29720cbce3ae0bcc525e1a59b2902a76f15b6380 Mon Sep 17 00:00:00 2001
>From: Nicolas Legrand <nicolas.legrand@bulac.fr>
>Date: Wed, 21 Oct 2020 13:29:00 +0200
>Subject: [PATCH] Bug 24412: (follow-up) qa-tools
>
>fix obvious problems:
>
> 1. qa -c 7 -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(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/holds.js b/koha-tmpl/intranet-tmpl/prog/js/holds.js
>index 0ebc0d6..5ac0979 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 b4068f3..dd5736d 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 20cb695..538e711 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(
> {
>@@ -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;
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 24412: 97328 | 97329 | 97330 | 101625 | 101626 | 101627 | 101628 | 101629 | 101630 | 101721 | 101722 | 101723 | 101825 | 101884 | 101885 | 101886 | 101898 | 101899 | 101900 | 101955 | 101956 | 101957 | 106586 | 106648 | 110067 | 110068 | 110069 | 110070 | 110450 | 110451 | 110452 | 110453 | 110454 | 110455 | 110582 | 110583 | 110584 | 110585 | 110586 | 112046 | 112047 | 112048 | 112049 | 112050 | 112092 | 112099 | 112165 | 112166 | 112167 | 112168 | 112169 | 112170 | 112171 | 112172 | 112201 | 112202 | 112203 | 112204 | 112205 | 112206 | 112207 | 112208 | 112209 | 112210 | 112211 | 112212 | 112213 | 112214 | 112215 | 112216 | 112217 | 112218 | 112219 | 112264 | 112265 | 112266 | 112267 | 112268 | 112269 | 112270 | 112271 | 112272 | 112292 | 112293 | 113108 | 113109 | 113116 | 113228 | 113229 | 113230 | 113231 | 113232 | 113233 | 113234 | 113235 | 113236