From efe86ac893eb018858af6aff14d015afe576cd4f Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 20 Jun 2016 19:25:12 +0000 Subject: [PATCH] Bug 15128 [QA Followup 2] - Only count pending suggestions for the limit Signed-off-by: Barbara Walters Signed-off-by: Kyle M Hall --- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt | 6 +++--- opac/opac-suggestions.pl | 10 ++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt index 140b902..3764852 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt @@ -28,7 +28,7 @@
[% IF ( op_add ) %] - [% IF ( Koha.Preference('MaxOpenSuggestions') && own_suggestions_count >= Koha.Preference('MaxOpenSuggestions') ) %] + [% IF ( Koha.Preference('MaxOpenSuggestions') && patrons_pending_suggestions_count >= Koha.Preference('MaxOpenSuggestions') ) %]

You cannot place any more suggestions

You have reached your limit of suggestions you can place at this time ([% Koha.Preference('MaxOpenSuggestions') %]). Once the library has processed those suggestions you will be able to place more.

[% ELSE %] @@ -152,7 +152,7 @@ [% IF ( loggedinusername || ( Koha.Preference( 'AnonSuggestions' ) == 1 ) ) %]
- [% IF ( Koha.Preference('MaxOpenSuggestions') && own_suggestions_count >= Koha.Preference('MaxOpenSuggestions') ) %] + [% IF ( Koha.Preference('MaxOpenSuggestions') && patrons_pending_suggestions_count >= Koha.Preference('MaxOpenSuggestions') ) %]

You have reached your limit of suggestions you can place at this time ([% Koha.Preference('MaxOpenSuggestions') %]).
Once the library has processed those suggestions you will be able to place more.

[% ELSE %] New purchase suggestion @@ -256,7 +256,7 @@

There are no pending purchase suggestions.

[% END %] [% IF ( loggedinusername || ( Koha.Preference( 'AnonSuggestions' ) == 1 ) ) %] - [% IF ( Koha.Preference('MaxOpenSuggestions') && own_suggestions_count >= Koha.Preference('MaxOpenSuggestions') ) %] + [% IF ( Koha.Preference('MaxOpenSuggestions') && patrons_pending_suggestions_count >= Koha.Preference('MaxOpenSuggestions') ) %]

You have reached your limit of suggestions you can place at this time.
Once the library has processed those suggestions you will be able to place more

[% ELSE %]

New purchase suggestion

diff --git a/opac/opac-suggestions.pl b/opac/opac-suggestions.pl index 4624658..6d2b88b 100755 --- a/opac/opac-suggestions.pl +++ b/opac/opac-suggestions.pl @@ -112,10 +112,12 @@ if ( $op eq 'else' ) { } } +my $patrons_pending_suggestions_count = scalar @{ SearchSuggestion( { suggestedby => $borrowernumber, STATUS => 'ASKED' } ) }; + my $suggestions_loop = &SearchSuggestion($suggestion); if ( $op eq "add_confirm" ) { my $count_own_suggestions = $borrowernumber ? &SearchSuggestion( { suggestedby => $borrowernumber } ) : 0; - if ( @$count_own_suggestions >= C4::Context->preference("MaxOpenSuggestions") ) + if ( $patrons_pending_suggestions_count >= C4::Context->preference("MaxOpenSuggestions") ) { push @messages, { type => 'error', code => 'too_many' }; } @@ -209,11 +211,7 @@ $template->param( messages => \@messages, suggestionsview => 1, suggested_by_anyone => $suggested_by_anyone, - own_suggestions_count => scalar @{ - SearchSuggestion( - { suggestedby => $borrowernumber, STATUS => 'ASKED' } - ) - }, + patrons_pending_suggestions_count => $patrons_pending_suggestions_count, ); output_html_with_http_headers $input, $cookie, $template->output; -- 2.1.4