Attachment 102386 Details for Bug 4461 – Bug 4461: Use inbound_email_address to know if we display the dropdown list

[patch] Bug 4461: Use inbound_email_address to know if we display the dropdown list

Bug-4461-Use-inboundemailaddress-to-know-if-we-dis.patch (text/plain), 2.55 KB, created by Jonathan Druart on 2020-04-03 13:14:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2020-04-03 13:14:28 UTC

Size: 2.55 KB

patch

obsolete

>From ca90f3d28bced9015004fced0fe14cfa4e3e3738 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Fri, 3 Apr 2020 15:06:53 +0200
>Subject: [PATCH] Bug 4461: Use inbound_email_address to know if we display the
> dropdown list
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> .../opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt     | 2 +-
> opac/opac-reportproblem.pl                                   | 5 ++---
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt
>index efae1019a2..ae347d7690 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt
>@@ -51,7 +51,7 @@
>                                 <ol>
>                                     <li>
>                                         <label for="recipient">Send problem report to: </label>
>-                                        [% IF library.branchemail %]
>+                                        [% IF library.inbound_email_address && library.inbound_email_address != Koha.Preference('KohaAdminEmailAddress') %]
>                                             <select name="recipient" id="recipient">
>                                                 <option value="library">A librarian</option>
>                                                 <option value="admin">Koha administrator</option>
>diff --git a/opac/opac-reportproblem.pl b/opac/opac-reportproblem.pl
>index 2abce15c1f..b7e133c3a7 100755
>--- a/opac/opac-reportproblem.pl
>+++ b/opac/opac-reportproblem.pl
>@@ -52,9 +52,8 @@ my $referer = Koha::Util::Navigation::local_referer($input );
> $referer = Encode::decode_utf8 uri_unescape $referer,
> 
> my $patron = Koha::Patrons->find($borrowernumber);
>+my $library = $patron->library;
> my $username = $patron->userid;
>-my $branchcode = $patron->branchcode;
>-my $library = Koha::Libraries->find($branchcode);
> my @messages;
> 
> $template->param(
>@@ -81,7 +80,7 @@ if ( $op eq 'addreport' ) {
>                         title          => $subject,
>                         content        => $message,
>                         borrowernumber => $borrowernumber,
>-                        branchcode     => $branchcode,
>+                        branchcode     => $patron->branchcode,
>                         username       => $username,
>                         problempage    => $problempage,
>                         recipient      => $recipient,
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 4461: 58887 | 59032 | 61654 | 65871 | 66253 | 66323 | 66324 | 98687 | 98688 | 98689 | 98725 | 99551 | 99599 | 99600 | 99601 | 99602 | 99603 | 99633 | 99635 | 99636 | 99637 | 99638 | 99639 | 99929 | 99930 | 99931 | 99932 | 99933 | 99934 | 99935 | 99936 | 99937 | 99938 | 99939 | 99940 | 99941 | 99942 | 100488 | 100489 | 100490 | 100491 | 100492 | 100493 | 100494 | 100495 | 100496 | 100497 | 100498 | 100499 | 100500 | 100506 | 100507 | 100508 | 100509 | 100510 | 100511 | 100512 | 100513 | 100514 | 100515 | 100516 | 100517 | 100518 | 100519 | 100520 | 100521 | 100522 | 100523 | 100524 | 100619 | 100989 | 100990 | 102188 | 102189 | 102190 | 102191 | 102192 | 102193 | 102194 | 102195 | 102196 | 102198 | 102200 | 102201 | 102202 | 102203 | 102204 | 102205 | 102206 | 102207 | 102208 | 102209 | 102210 | 102211 | 102253 | 102279 | 102281 | 102308 | 102309 | 102310 | 102311 | 102312 | 102313 | 102314 | 102315 | 102316 | 102317 | 102318 | 102319 | 102320 | 102321 | 102322 | 102323 | 102324 | 102325 | 102326 | 102327 | 102328 | 102329 | 102330 | 102331 | 102358 | 102359 | 102360 | 102361 | 102362 | 102363 | 102364 | 102365 | 102366 | 102367 | 102368 | 102369 | 102370 | 102371 | 102372 | 102373 | 102374 | 102375 | 102376 | 102377 | 102378 | 102379 | 102380 | 102381 | 102382 | 102383 | 102384 | 102385 | 102386