X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=mainpage.pl;h=49f46fc272f594848c9ac3cca3bb956ac4c4b000;hb=8f3d5fc3dc7da6d2733f2e9944835757736cc474;hp=1ccffad86705da9f4588b3fc189bc21f57081490;hpb=45975f4087462d3b2ae06bca11fe70ae0127db3a;p=srvgit

diff --git a/mainpage.pl b/mainpage.pl
index 1ccffad867..49f46fc272 100755
--- a/mainpage.pl
+++ b/mainpage.pl
@@ -25,11 +25,12 @@ use C4::Output;
 use C4::Auth;
 use C4::Koha;
 use C4::NewsChannels; # GetNewsToDisplay
-use C4::Review qw/numberofreviews/;
 use C4::Suggestions qw/CountSuggestion/;
 use C4::Tags qw/get_count_by_tag_status/;
-use Koha::Borrower::Modifications;
-use Koha::Borrower::Discharge;
+use Koha::Patron::Modifications;
+use Koha::Patron::Discharge;
+use Koha::Reviews;
+use Koha::ArticleRequests;
 
 my $query = new CGI;
 
@@ -56,17 +57,23 @@ $template->param(
 );
 
 my $branch =
-  C4::Context->preference("IndependentBranches")
+  (      C4::Context->preference("IndependentBranchesPatronModifications")
+      || C4::Context->preference("IndependentBranches") )
   && !$flags->{'superlibrarian'}
   ? C4::Context->userenv()->{'branch'}
   : undef;
 
-my $pendingcomments    = numberofreviews(0);
+my $pendingcomments    = Koha::Reviews->search_limited({ approved => 0 })->count;
 my $pendingtags        = get_count_by_tag_status(0);
 my $pendingsuggestions = CountSuggestion("ASKED");
-my $pending_borrower_modifications =
-  Koha::Borrower::Modifications->GetPendingModificationsCount( $branch );
-my $pending_discharge_requests = Koha::Borrower::Discharge::count({ pending => 1 });
+my $pending_borrower_modifications = Koha::Patron::Modifications->pending_count( $branch );
+my $pending_discharge_requests = Koha::Patron::Discharge::count({ pending => 1 });
+my $pending_article_requests = Koha::ArticleRequests->search_limited(
+    {
+        status => Koha::ArticleRequest::Status::Pending,
+        $branch ? ( 'me.branchcode' => $branch ) : (),
+    }
+)->count;
 
 $template->param(
     pendingcomments                => $pendingcomments,
@@ -74,13 +81,7 @@ $template->param(
     pendingsuggestions             => $pendingsuggestions,
     pending_borrower_modifications => $pending_borrower_modifications,
     pending_discharge_requests     => $pending_discharge_requests,
+    pending_article_requests       => $pending_article_requests,
 );
 
-#
-# warn user if he is using mysql/admin login
-#
-unless ($loggedinuser) {
-    $template->param(adminWarning => 1);
-}
-
 output_html_with_http_headers $query, $cookie, $template->output;