Bug 23091: Add template handling for new messages

[srvgit] / circ / checkout-notes.pl

diff --git a/circ/checkout-notes.pl b/circ/checkout-notes.pl
index ceb52c9..61ce7cc 100755 (executable)
--- a/circ/checkout-notes.pl
+++ b/circ/checkout-notes.pl
@@ -25,24 +25,17 @@ use C4::Output;
 use C4::Auth;
 use Koha::Checkouts;
 
-my $query = new CGI;
+my $query = CGI->new;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
         template_name   => "circ/checkout-notes.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { circulation => "manage_checkout_notes" },
+        flagsrequired   => { circulate => "manage_checkout_notes" },
     }
 );
 
-my $schema = Koha::Database->new()->schema();
-my @notes = $schema->resultset('Issue')->search({ 'me.note' => { '!=', undef } }, { prefetch => [ 'borrower', { item => 'biblionumber' } ] });
-$template->param(
-    notes     => \@notes,
-);
-
 my $action;
 foreach (qw( seen notseen )) {
     $action = $_ if ( $query->param("mark_selected-$_") );
@@ -63,9 +56,11 @@ if ( $action eq 'seen' ) {
     }
 }
 
+my $notes = Koha::Checkouts->search({ 'me.note' => { '!=', undef } }, { prefetch => [ 'borrower', { item => 'biblionumber' } ] });
 $template->param(
     selected_count => scalar(@issue_ids),
     action         => $action,
+    notes          => $notes,
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;