From 60e8b511008bfa2d2b984120d0ea1468be7e2abf Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 8 Sep 2020 15:21:24 +0200 Subject: [PATCH] Bug 26406: Fix suggestions filter at the OPAC There is an input filter but it does nothing Test plan: You need 2 differents users, U1 and U2 Create several (at least one) suggestions for each of them Test the following with and without OPACViewOthersSuggestions: With U1 logged in, go to the suggestions tab and use the input to filter the suggestions. It should work correctly. Also play with the "Suggested by" options Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit ee0384184630b6c1b4c74e7a250e1cbc71c3e17f) Signed-off-by: Fridolin Somers --- .../bootstrap/en/modules/opac-suggestions.tt | 31 +++++++++++-------- opac/opac-suggestions.pl | 9 +++++- 2 files changed, 26 insertions(+), 14 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 d5dde87f01..68c2690b97 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt @@ -284,10 +284,11 @@ [% IF ( deleted ) %]
The selected suggestions have been deleted.
[% END %] - [% IF ( suggestions_loop ) %] - [% SET can_delete_suggestion = 0 %] + [% IF suggestions_loop OR title_filter %]
+ + [% IF Koha.Preference( 'OPACViewOthersSuggestions' ) == 1 %] [% IF loggedinusername %]
@@ -302,13 +303,16 @@ [% END %]
-
- -
[% END %] [% END %] +
+ +
+ [% END %] + [% IF suggestions_loop %] + [% SET can_delete_suggestion = 0 %]
[% IF ( loggedinusername || ( Koha.Preference( 'AnonSuggestions' ) == 1 ) ) %] @@ -425,18 +429,20 @@
[% ELSE %] [% IF Koha.Preference( 'OPACViewOthersSuggestions' ) %] - [% IF ( loggedinusername ) %] - [% IF ( suggested_by_anyone ) %] -

There are no pending purchase suggestions.

- [% ELSE %] -

You have no pending purchase suggestions. View all suggestions

- [% END %] + [% IF title_filter %] +

There are no pending purchase suggestions matching your search.

+ [% ELSIF loggedinusername AND NOT suggested_by_anyone %] +

You have no pending purchase suggestions. View all suggestions

[% ELSE %]

There are no pending purchase suggestions.

[% END %] [% ELSE %] [% IF ( loggedinusername ) %] -

You have no pending purchase suggestions.

+ [% IF title_filter %] +

There are no pending purchase suggestions matching your search.

+ [% ELSE %] +

You have no pending purchase suggestions.

+ [% END %] [% ELSE %]

You are not authorized to see pending purchase suggestions.

[% END %] @@ -480,7 +486,6 @@ $(function() { $("#suggestt").dataTable($.extend(true, {}, dataTablesDefaults, { "order": [[ 1, "asc" ]], - "dom": '<"top"<"table_entries"><"table_controls"f>>t', "autoWidth": false, "columnDefs": [ [% IF ( loggedinusername ) %]{ "targets": [ 0 ], "sortable": false, "searchable": false }[% END %] diff --git a/opac/opac-suggestions.pl b/opac/opac-suggestions.pl index 77e0fcedb8..b1f1701ddc 100755 --- a/opac/opac-suggestions.pl +++ b/opac/opac-suggestions.pl @@ -41,6 +41,7 @@ my $biblionumber = $input->param('biblionumber'); my $suggestion = $input->Vars; my $negcaptcha = $input->param('negcap'); my $suggested_by_anyone = $input->param('suggested_by_anyone') || 0; +my $title_filter = $input->param('title_filter'); my $need_confirm = 0; # If a spambot accidentally populates the 'negcap' field in the sugesstions form, then silently skip and return. @@ -188,7 +189,12 @@ if ( $op eq "add_confirm" ) { $op = 'else'; } -my $suggestions_loop = &SearchSuggestion({suggestedby => $suggestion->{suggestedby}}); +my $suggestions_loop = &SearchSuggestion( + { + suggestedby => $suggestion->{suggestedby}, + title => $title_filter, + } +); if ( $op eq "delete_confirm" ) { my @delete_field = $input->multi_param("delete_field"); foreach my $delete_field (@delete_field) { @@ -261,6 +267,7 @@ $template->param( messages => \@messages, suggestionsview => 1, suggested_by_anyone => $suggested_by_anyone, + title_filter => $title_filter, patrons_pending_suggestions_count => $patrons_pending_suggestions_count, need_confirm => $need_confirm, patrons_total_suggestions_count => $patrons_total_suggestions_count, -- 2.39.5