Attachment 71736 Details for Bug 18789 – Bug 18789: (QA follow-up) Fix viewlog when accessed via circulation

[patch] Bug 18789: (QA follow-up) Fix viewlog when accessed via circulation

Bug-18789-QA-follow-up-Fix-viewlog-when-accessed-v.patch (text/plain), 2.57 KB, created by Josef Moravec on 2018-02-16 11:13:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2018-02-16 11:13:55 UTC

Size: 2.57 KB

patch

obsolete

>From 27dc9ca9037d18b93420092475c78865a21d015e Mon Sep 17 00:00:00 2001
>From: Josef Moravec <josef.moravec@gmail.com>
>Date: Fri, 16 Feb 2018 11:00:25 +0000
>Subject: [PATCH] Bug 18789: (QA follow-up) Fix viewlog when accessed via
> circulation
>
>Test plan:
>Go to any patron and then to Modification log of this patron
>-- without patch you will not see the left side menu and patron information
>-- with patch menu and patron information is here, and should be fully
>working (links)
>
>Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt |  2 +-
> tools/viewlog.pl                                         | 13 +++----------
> 2 files changed, 4 insertions(+), 11 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>index 0223844..93932e7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
>@@ -274,7 +274,7 @@
> 			</div>
> 		</div>
> 		<div class="yui-b noprint">
>-			[% IF ( menu ) %]
>+        [% IF ( circulation ) %]
> 				[% INCLUDE 'circ-menu.inc' %]
> 			[% ELSE %]
> 				[% IF ( CATALOGUING ) %]
>diff --git a/tools/viewlog.pl b/tools/viewlog.pl
>index 54082df..e9e9f42 100755
>--- a/tools/viewlog.pl
>+++ b/tools/viewlog.pl
>@@ -70,7 +70,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
> if ( $src eq 'circ' ) {
> 
>     # if we were called from circulation, use the circulation menu and get data to populate it -fbcit
>-    use C4::Members;
>     use C4::Members::Attributes qw(GetBorrowerAttributes);
>     my $borrowernumber = $object;
>     my $patron = Koha::Patrons->find( $borrowernumber );
>@@ -78,23 +77,17 @@ if ( $src eq 'circ' ) {
>         print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber");
>         exit;
>     }
>-    $template->param( picture => 1 ) if $patron->image;
>-    my $data = $patron->unblessed;
>-
>     if ( C4::Context->preference('ExtendedPatronAttributes') ) {
>-        my $attributes = GetBorrowerAttributes( $data->{'borrowernumber'} );
>+        my $attributes = GetBorrowerAttributes( $borrowernumber );
>         $template->param(
>             ExtendedPatronAttributes => 1,
>             extendedattributes       => $attributes
>         );
>     }
> 
>-    $template->param(%$data);
>-
>     $template->param(
>-        menu           => 1,
>-        borrowernumber => $borrowernumber,
>-        categoryname   => $patron->category->description,
>+        patron      => $patron,
>+        circulation => 1,
>     );
> }
> 
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 18789: 64211 | 64212 | 64213 | 64214 | 64215 | 64216 | 64218 | 64219 | 64221 | 64229 | 71301 | 71302 | 71303 | 71304 | 71305 | 71306 | 71307 | 71308 | 71309 | 71310 | 71311 | 71485 | 71486 | 71487 | 71488 | 71489 | 71490 | 71491 | 71492 | 71493 | 71494 | 71495 | 71496 | 71679 | 71680 | 71681 | 71682 | 71683 | 71684 | 71685 | 71686 | 71687 | 71688 | 71689 | 71690 | 71691 | 71713 | 71714 | 71715 | 71716 | 71717 | 71718 | 71719 | 71720 | 71721 | 71722 | 71723 | 71724 | 71725 | 71726 | 71727 | 71728 | 71729 | 71730 | 71731 | 71732 | 71733 | 71734 | 71735 | 71736 | 71827 | 71838 | 71841 | 73293 | 73890 | 75237