Bug 7674: Separate items in two tabs on biblio detail page (staff+opac)

[koha.git] / catalogue / issuehistory.pl

diff --git a/catalogue/issuehistory.pl b/catalogue/issuehistory.pl
index 2db1735..a5c4d0d 100755 (executable)
--- a/catalogue/issuehistory.pl
+++ b/catalogue/issuehistory.pl
@@ -17,14 +17,16 @@
 
 
 use strict;
-require Exporter;
+#use warnings; FIXME - Bug 2505
+
 use CGI;
 use C4::Auth;
 use C4::Output;
 
 use C4::Circulation;    # GetBiblioIssues
 use C4::Biblio;    # GetBiblio GetBiblioFromItemNumber
-use C4::Date;
+use C4::Search;                # enabled_staff_search_views
+use Koha::DateUtils;
 
 my $query = new CGI;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
@@ -33,7 +35,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { circulate => 1 },
+        flagsrequired   => { circulate => "circulate_remaining_permissions" },
     }
 );
 
@@ -41,37 +43,41 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 my $params = $query->Vars;
 
 my $biblionumber = $params->{'biblionumber'};
-my $itemnumber = $params->{'itemnumber'};
-my $title        = $params->{'title'};
-my $author       = $params->{'author'};
+my $itemnumber   = $params->{'itemnumber'};
+
+if (C4::Context->preference("HidePatronName")) {
+   $template->param(HidePatronName => 1);
+}
 
-my ($issues,$biblio,$title,$author,$barcode);
+my ($issues,$biblio,$barcode);
 if ($itemnumber){
-$issues=GetItemIssues($itemnumber);
-$biblio=GetBiblioFromItemNumber($itemnumber);
-$biblionumber=$biblio->{biblionumber};
-$barcode=$issues->[0]->{barcode};
-$template->param(
-    %$biblio,
-    barcode=> $barcode,
-);
+       $issues=GetItemIssues($itemnumber);
+       $biblio=GetBiblioFromItemNumber($itemnumber);
+       $biblionumber=$biblio->{biblionumber};
+       $barcode=$issues->[0]->{barcode};
+       $template->param(
+               %$biblio,
+               barcode=> $barcode,
+       );
 } else {
-my @biblio;
-$issues = GetBiblioIssues($biblionumber);
-my (undef,@biblio)=GetBiblio($biblionumber);
-my $total  = scalar @$issues;
-$template->param(
-    %{$biblio[0]},
-);
+       $issues = GetBiblioIssues($biblionumber);
+        my $biblio = GetBiblio($biblionumber);
+       my $total  = scalar @$issues;
+       $template->param(
+               %{$biblio},
+       );
 } 
-foreach (@$issues){
-  $_->{date_due}=format_date($_->{date_due});
-  $_->{issuedate}=format_date($_->{issuedate});
-  $_->{returndate}=format_date($_->{returndate});
+foreach (@{$issues}){
+       $_->{date_due}   = format_sqldatetime($_->{date_due});
+       $_->{issuedate}  = format_sqldatetime($_->{issuedate});
+       $_->{returndate} = format_sqldatetime($_->{returndate});
+       $_->{lastreneweddate} = format_sqldatetime($_->{lastreneweddate});
 }
 $template->param(
     total        => scalar @$issues,
-    issues       => $issues
+    issues       => $issues,
+       issuehistoryview => 1,
+       C4::Search::enabled_staff_search_views,
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;