Bugzilla – Attachment 109748 Details for
Bug 26406
Suggestions filter does not work
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 26406: Fix suggestions filter at the OPAC
Bug-26406-Fix-suggestions-filter-at-the-OPAC.patch (text/plain), 6.92 KB, created by
Jonathan Druart
on 2020-09-08 13:24:01 UTC
(
hide
)
Description:
Bug 26406: Fix suggestions filter at the OPAC
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2020-09-08 13:24:01 UTC
Size:
6.92 KB
patch
obsolete
>From 6de6e2dd04f77c6e95cd4d660d61cf03978c3224 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >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 >--- > .../bootstrap/en/modules/opac-suggestions.tt | 28 +++++++++++-------- > opac/opac-suggestions.pl | 9 +++++- > 2 files changed, 24 insertions(+), 13 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 499f330fb0..596e505a3b 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt >@@ -255,12 +255,11 @@ > > [% IF ( deleted ) %]<div class="alert alert-info">The selected suggestions have been deleted.</div>[% END %] > >- [% IF ( suggestions_loop ) %] >- [% SET can_delete_suggestion = 0 %] >+ [% IF suggestions_loop OR title_filter %] > <form action="/cgi-bin/koha/opac-suggestions.pl" class="form-inline" method="get"> > <fieldset> >- <label for="title">Search for:</label> >- <input type="text" name="title" id="title" value="[% title | html %]" /> >+ <label for="title_filter">Search for:</label> >+ <input type="text" name="title_filter" id="title_filter" value="[% title_filter | html %]" /> > [% IF Koha.Preference( 'OPACViewOthersSuggestions' ) == 1 %] > [% IF loggedinusername %] > <label for="suggested_by_anyone">Suggested by:</label> >@@ -274,12 +273,15 @@ > <option value="1">Anyone</option> > [% END %] > </select> >- <button type="submit" class="btn">Go</button> > </div> > [% END %] > [% END %] >+ <button type="submit" class="btn">Go</button> > </fieldset> > </form> >+ [% END %] >+ [% IF suggestions_loop %] >+ [% SET can_delete_suggestion = 0 %] > <form action="/cgi-bin/koha/opac-suggestions.pl" method="post" id="delete_suggestions"> > <input type="hidden" name="op" value="delete_confirm" /> > [% IF ( loggedinusername || ( Koha.Preference( 'AnonSuggestions' ) == 1 ) ) %] >@@ -396,18 +398,20 @@ > </form> > [% ELSE %] > [% IF Koha.Preference( 'OPACViewOthersSuggestions' ) %] >- [% IF ( loggedinusername ) %] >- [% IF ( suggested_by_anyone ) %] >- <p>There are no pending purchase suggestions.</p> >- [% ELSE %] >- <p>You have no pending purchase suggestions. <a href="/cgi-bin/koha/opac-suggestions.pl?suggested_by_anyone=1">View all suggestions</a></p> >- [% END %] >+ [% IF title_filter %] >+ <p>There are no pending purchase suggestions matching your search.</p> >+ [% ELSIF loggedinusername AND NOT suggested_by_anyone %] >+ <p>You have no pending purchase suggestions. <a href="/cgi-bin/koha/opac-suggestions.pl?suggested_by_anyone=1">View all suggestions</a></p> > [% ELSE %] > <p>There are no pending purchase suggestions.</p> > [% END %] > [% ELSE %] > [% IF ( loggedinusername ) %] >- <p>You have no pending purchase suggestions.</p> >+ [% IF title_filter %] >+ <p>There are no pending purchase suggestions matching your search.</p> >+ [% ELSE %] >+ <p>You have no pending purchase suggestions.</p> >+ [% END %] > [% ELSE %] > <p>You are not authorized to see pending purchase suggestions.</p> > [% END %] >diff --git a/opac/opac-suggestions.pl b/opac/opac-suggestions.pl >index 22f6442c9b..dd89c8a828 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) { >@@ -265,6 +271,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.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 26406
:
109748
|
109762
|
116630
|
116862