Bug 26265: (QA follow-up) Remove g option from regex, add few dirs

[koha-equinox.git] / mainpage.pl

diff --git a/mainpage.pl b/mainpage.pl
index 7410247..c062f5d 100755 (executable)
--- a/mainpage.pl
+++ b/mainpage.pl
@@ -31,6 +31,8 @@ use Koha::Patron::Modifications;
 use Koha::Patron::Discharge;
 use Koha::Reviews;
 use Koha::ArticleRequests;
+use Koha::ProblemReports;
+use Koha::Quotes;
 
 my $query = new CGI;
 
@@ -53,7 +55,8 @@ my $koha_news_count = scalar @$all_koha_news;
 
 $template->param(
     koha_news       => $all_koha_news,
-    koha_news_count => $koha_news_count
+    koha_news_count => $koha_news_count,
+    daily_quote     => Koha::Quotes->get_daily_quote(),
 );
 
 my $branch =
@@ -63,17 +66,18 @@ my $branch =
   ? C4::Context->userenv()->{'branch'}
   : undef;
 
-my $pendingcomments    = Koha::Reviews->search({ approved => 0 })->count;
+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::Patron::Modifications->pending_count( $branch );
 my $pending_discharge_requests = Koha::Patron::Discharge::count({ pending => 1 });
-my $pending_article_requests = Koha::ArticleRequests->count(
+my $pending_article_requests = Koha::ArticleRequests->search_limited(
     {
         status => Koha::ArticleRequest::Status::Pending,
-        $branch ? ( branchcode => $branch ) : (),
+        $branch ? ( 'me.branchcode' => $branch ) : (),
     }
-);
+)->count;
+my $pending_problem_reports = Koha::ProblemReports->search({ status => 'New' });
 
 $template->param(
     pendingcomments                => $pendingcomments,
@@ -82,13 +86,7 @@ $template->param(
     pending_borrower_modifications => $pending_borrower_modifications,
     pending_discharge_requests     => $pending_discharge_requests,
     pending_article_requests       => $pending_article_requests,
+    pending_problem_reports        => $pending_problem_reports
 );
 
-#
-# warn user if he is using mysql/admin login
-#
-unless ($loggedinuser) {
-    $template->param(adminWarning => 1);
-}
-
 output_html_with_http_headers $query, $cookie, $template->output;