Bug 24065: Fail shib login if multiple users matched

[srvgit] / catalogue / issuehistory.pl

diff --git a/catalogue/issuehistory.pl b/catalogue/issuehistory.pl
index a3e349d..0c50dcb 100755 (executable)
--- a/catalogue/issuehistory.pl
+++ b/catalogue/issuehistory.pl
@@ -16,16 +16,19 @@
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 
-use strict;
-#use warnings; FIXME - Bug 2505
+use Modern::Perl;
 
 use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Output;
 
-use C4::Circulation;    # GetBiblioIssues
-use C4::Biblio;    # GetBiblio GetBiblioFromItemNumber
+use C4::Biblio;    # GetBiblio
 use C4::Search;                # enabled_staff_search_views
+use C4::Serials;
+use Koha::Checkouts;
+use Koha::Old::Checkouts;
+
+use Koha::Biblios;
 
 my $query = new CGI;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
@@ -38,24 +41,31 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     }
 );
 
-# getting cgi params.
-my $params = $query->Vars;
-
-my $biblionumber = $params->{'biblionumber'};
+my $biblionumber = $query->param('biblionumber');
 
-if (C4::Context->preference("HidePatronName")) {
-   $template->param(HidePatronName => 1);
-}
+my @checkouts = Koha::Checkouts->search(
+    { biblionumber => $biblionumber },
+    {
+        join       => 'item',
+        order_by   => 'timestamp',
+    }
+);
+my @old_checkouts = Koha::Old::Checkouts->search(
+    { biblionumber => $biblionumber },
+    {
+        join       => 'item',
+        order_by   => 'timestamp',
+    }
+);
 
-my $issues = GetBiblioIssues($biblionumber);
-my $biblio = GetBiblio($biblionumber);
-$template->param(%$biblio);
+my $biblio = Koha::Biblios->find( $biblionumber );
 
 $template->param(
-    total        => scalar @$issues,
-    issues       => $issues,
+    checkouts => [ @checkouts, @old_checkouts ],
+    biblio    => $biblio,
        issuehistoryview => 1,
        C4::Search::enabled_staff_search_views,
+    subscriptionsnumber => CountSubscriptionFromBiblionumber($biblionumber),
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;