From f3a9f74be103dc00af0ca492b02d1d0c1b668c35 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 20 Dec 2013 16:52:16 +0100 Subject: [PATCH] [PASSED QA] Bug 11430: Intranet changes Signed-off-by: sonia BOUIS Signed-off-by: Kyle M Hall --- catalogue/search-history.pl | 5 +- .../prog/en/modules/catalogue/search-history.tt | 260 +++++++++++++------- 2 files changed, 169 insertions(+), 96 deletions(-) diff --git a/catalogue/search-history.pl b/catalogue/search-history.pl index 20e3b82..aae7884 100755 --- a/catalogue/search-history.pl +++ b/catalogue/search-history.pl @@ -46,10 +46,7 @@ if ( $action eq 'delete' ) { : q{}; C4::Search::History::delete( { - userid => $loggedinuser, - sessionid => $sessionid, - type => $type, - previous => $previous + id => [ $cgi->param('id') ], } ); # Redirecting to this same url so the user won't see the search history link in the header diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt index 1c3c800..dbee0ab 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt @@ -5,24 +5,68 @@ [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] - + @@ -51,57 +95,73 @@ $(document).ready(function() { [% IF ( current_biblio_searches ) %]

Current session

+
+ Select all + Clear all + | + + Select searches to: + Delete + +
- - - + + + + + + + + + + + [% FOREACH s IN current_biblio_searches %] + + + + + + + [% END %] + +
DateSearchResults
[% s.time |$KohaDates with_hours => 1 %][% s.query_desc |html %][% s.total %]
- - - - - - - - - - [% FOREACH s IN current_biblio_searches %] - - - - - - [% END %] - -
DateSearchResults
[% s.time |$KohaDates with_hours => 1 %][% s.query_desc |html %][% s.total %]
[% END %] [% IF ( previous_biblio_searches ) %]

Previous sessions

+
+ Select all + Clear all + | + + Select searches to: + Delete + +
- - - + + + + + + + + + + + [% FOREACH s IN previous_biblio_searches %] + + + + + + + [% END %] + +
DateSearchResults
[% s.time |$KohaDates with_hours => 1 %][% s.query_desc |html %][% s.total %]
- - - - - - - - - - [% FOREACH s IN previous_biblio_searches %] - - - - - - [% END %] - -
DateSearchResults
[% s.time |$KohaDates with_hours => 1 %][% s.query_desc |html %][% s.total %]
[% END %] [% IF !current_biblio_searches && !previous_biblio_searches %] @@ -113,57 +173,73 @@ $(document).ready(function() { [% IF ( current_authority_searches ) %]

Current session

+
+ Select all + Clear all + | + + Select searches to: + Delete + +
- - - + + + + + + + + + + + [% FOREACH s IN current_authority_searches %] + + + + + + + [% END %] + +
DateSearchResults
[% s.time |$KohaDates with_hours => 1 %][% s.query_desc |html %][% s.total %]
- - - - - - - - - - [% FOREACH s IN current_authority_searches %] - - - - - - [% END %] - -
DateSearchResults
[% s.time |$KohaDates with_hours => 1 %][% s.query_desc |html %][% s.total %]
[% END %] [% IF ( previous_authority_searches ) %]

Previous sessions

+
+ Select all + Clear all + | + + Select searches to: + Delete + +
- - - + + + + + + + + + + + [% FOREACH s IN previous_authority_searches %] + + + + + + + [% END %] + +
DateSearchResults
[% s.time |$KohaDates with_hours => 1 %][% s.query_desc |html %][% s.total %]
- - - - - - - - - - [% FOREACH s IN previous_authority_searches %] - - - - - - [% END %] - -
DateSearchResults
[% s.time |$KohaDates with_hours => 1 %][% s.query_desc |html %][% s.total %]
[% END %] [% IF !current_authority_searches && !previous_authority_searches %] -- 1.7.2.5