Fix for Bug 4498 - Acq always shows '1 suggestions waiting'

- Removing 'suggestions waiting' link from left-hand menu. A plain
  'suggestions' link is still shown if suggestions are enabled.
- Putting back the 'pending suggestions' box that used to appear
  on the Acquisitions home page. This will show, with a count
  of pending suggestions, only if suggestions are turned on and
  there are pending suggestions.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl
index 45a04bf..ed96a9e 100755 (executable)
--- a/acqui/acqui-home.pl
+++ b/acqui/acqui-home.pl
@@ -38,6 +38,7 @@ use C4::Budgets;
 use C4::Members;
 use C4::Branch;
 use C4::Debug;
+use C4::Suggestions;
 
 my $query = CGI->new;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -74,6 +75,9 @@ if ( $cur_format eq 'FR' ) {
     );
 }
 
+my $status           = $query->param('status') || "ASKED";
+my $suggestions_count       = CountSuggestion($status);
+
 my $budget_arr =
   GetBudgetHierarchy( '', $user->{branchcode},
     $template->{param_map}->{'USER_INFO'}[0]->{'borrowernumber'} );
@@ -123,7 +127,6 @@ foreach my $budget ( @{$budget_arr} ) {
 }
 
 $template->param(
-
     type          => 'intranet',
     loop_budget   => $budget_arr,
     branchname    => $branchname,
@@ -132,6 +135,7 @@ $template->param(
     totordered    => $num_formatter->format_price($totordered),
     totcomtd      => $num_formatter->format_price($totcomtd),
     totavail      => $num_formatter->format_price($totavail),
+    suggestions_count    => $suggestions_count,
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
index 07e24de..392a6c5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
@@ -1,9 +1,6 @@
 <ul>
        <li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>
-    <li><!-- TMPL_IF name="suggestion" --> <a href="/cgi-bin/koha/suggestion/suggestion.pl"><!--TMPL_VAR NAME="suggestion" --> suggestions waiting</a>
-        <!-- TMPL_ELSE --> <a href="/cgi-bin/koha/suggestion/suggestion.pl">No suggestions waiting</a> <!-- /TMPL_IF -->
-    </li>
-       <li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Manage suggestions</a></li>
+       <!-- TMPL_IF NAME="suggestion" --><li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li><!-- TMPL_ELSE --><!-- /TMPL_IF -->
     <!-- TMPL_IF name="CAN_user_acquisition_budget_manage" -->
        <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets & Funds</a></li>
     <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
index c582679..02f5f22 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
@@ -43,6 +43,15 @@
     <!-- /TMPL_IF -->
     </fieldset>
 </div>
+
+<!-- TMPL_IF NAME="suggestion" --><!-- TMPL_IF name="suggestions_count" -->
+<div id="acqui_acqui_home_suggestions">
+    <fieldset>
+    <legend>Pending suggestions</legend>
+        <p><!--TMPL_VAR NAME="suggestions_count" --> suggestions waiting. <a href="/cgi-bin/koha/suggestion/suggestion.pl">Manage suggestions</a>.</p>
+    </fieldset>
+</div><!-- /TMPL_IF --><!-- /TMPL_IF -->
+
 </div>
 
 <div class="yui-u">