Attachment 63577 Details for Bug 18552 – Bug 18552: [QA Follow-up] Resolve warnings

[patch] Bug 18552: [QA Follow-up] Resolve warnings

Bug-18552-QA-Follow-up-Resolve-warnings.patch (text/plain), 2.53 KB, created by Marcel de Rooy on 2017-05-19 10:28:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2017-05-19 10:28:45 UTC

Size: 2.53 KB

patch

obsolete

>From eda703e0cad22734b74671082d1625ff3b3a53aa Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Fri, 19 May 2017 12:22:03 +0200
>Subject: [PATCH] Bug 18552: [QA Follow-up] Resolve warnings
>Content-Type: text/plain; charset=utf-8
>
>Like:
>Problem = a value of AutoResumeSuspendedHolds has been passed to param without key at /usr/share/koha/masterclone/C4/Templates.pm line 137.
>Problem = a value of relatives_borrowernumbers has been passed to param without key at /usr/share/koha/masterclone/C4/Templates.pm line 137.
>
>Problem is functions returning undef in list context (in this case
>housebound_role).
>No need to call Patrons::find a second time.
>
>Note: The call of GetDebarments in the first patch suffered from this too.
>It is in a fine place now too. But strictly speaking, should not have been
>moved.
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> members/moremember.pl | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/members/moremember.pl b/members/moremember.pl
>index 0027099..0e18d22 100755
>--- a/members/moremember.pl
>+++ b/members/moremember.pl
>@@ -343,6 +343,7 @@ my $translated_language = C4::Languages::language_get_description( $subtag, $sub
> 
> $template->param(
>     patron          => $patron,
>+    borrower        => $patron, # TODO Still needed by includes,
>     translated_language => $translated_language,
>     detailview      => 1,
>     borrowernumber  => $borrowernumber,
>@@ -354,11 +355,11 @@ $template->param(
>     totaldue        => sprintf("%.2f", $total),
>     totaldue_raw    => $total,
>     overdues_exist  => $overdues_exist,
>-    StaffMember     => ($category_type eq 'S'),
>-    is_child        => ($category_type eq 'C'),
>+    StaffMember     => $category_type eq 'S',
>+    is_child        => $category_type eq 'C',
>     samebranch      => $samebranch,
>     quickslip       => $quickslip,
>-    housebound_role => $patron->housebound_role,
>+    housebound_role => scalar $patron->housebound_role,
>     privacy_guarantor_checkouts => $data->{'privacy_guarantor_checkouts'},
>     AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
>     SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
>@@ -366,7 +367,6 @@ $template->param(
>     PatronsPerPage => C4::Context->preference("PatronsPerPage") || 20,
>     relatives_issues_count => $relatives_issues_count,
>     relatives_borrowernumbers => \@relatives,
>-    borrower => Koha::Patrons->find( $borrowernumber ),
> );
> 
> output_html_with_http_headers $input, $cookie, $template->output;
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 18552: 63551 | 63557 | 63576 | 63577 | 63597 | 63598