Bugzilla – Attachment 29109 Details for
Bug 11430
Search history: Delete selected lines
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 11430: Intranet changes
PASSED-QA-Bug-11430-Intranet-changes.patch (text/plain), 14.49 KB, created by
Kyle M Hall (khall)
on 2014-06-20 15:43:55 UTC
(
hide
)
Description:
[PASSED QA] Bug 11430: Intranet changes
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2014-06-20 15:43:55 UTC
Size:
14.49 KB
patch
obsolete
>From f3a9f74be103dc00af0ca492b02d1d0c1b668c35 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Fri, 20 Dec 2013 16:52:16 +0100 >Subject: [PATCH] [PASSED QA] Bug 11430: Intranet changes > >Signed-off-by: sonia BOUIS <sonia.bouis@univ-lyon3.fr> > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > 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' %] > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" /> > [% INCLUDE 'datatables.inc' %] >-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script> >+<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> > <script type="text/javascript"> > //<![CDATA[ >-var MSG_CONFIRM_DELETE_HISTORY = _("Are you sure you want to delete your search history?"); >+var MSG_CONFIRM_DELETE_HISTORY = _("Are you sure you want to delete selected search history entries?"); > $(document).ready(function() { > // We show table ordered by descending dates by default > // (so that the more recent query is shown first) > $(".historyt").dataTable($.extend(true, {}, dataTablesDefaults, { >- "aaSorting": [[ 0, "desc" ]], >- "aoColumns": [ >- { "sType": "title-string" }, >- null, >- null >- ] >+ "aaSorting": [[ 1, "desc" ]], >+ "aoColumnDefs": [ >+ { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false }, >+ { "aTargets": [ 1 ], "sType": "title-string" }, >+ ], > })); > > $('#tabs').tabs(); >+ >+ $(".CheckNone").click(function(e){ >+ e.preventDefault(); >+ var form = $(this).parents("form").get(0); >+ $(form).unCheckCheckboxes(); >+ enableCheckboxActions(form); >+ }); >+ $(".CheckAll").click(function(e){ >+ e.preventDefault(); >+ var form = $(this).parents("form").get(0); >+ $(form).checkCheckboxes(); >+ enableCheckboxActions(form); >+ }); >+ >+ $("input:checkbox").click(function(){ >+ var form = $(this).parents("form").get(0); >+ enableCheckboxActions(form); >+ }); >+ >+ $(".action_delete").click(function(e){ >+ e.preventDefault(); >+ var form = $(this).parents("form").get(0); >+ var ids = $(form).find("input:checkbox:checked"); >+ if ( $(ids).length < 1 ) { >+ return false; >+ } >+ if ( confirm(MSG_CONFIRM_DELETE_HISTORY) ) { >+ $(form).submit(); >+ } >+ return false; >+ }); >+ > }); >+ >+function enableCheckboxActions(form){ >+ // Enable/disable controls if checkboxes are checked >+ var checkedBoxes = $(form).find("input:checkbox:checked"); >+ if ($(checkedBoxes).size()) { >+ $(form).find(".selections").html(_("With selected searches: ")); >+ $(form).find(".selections-toolbar .links a").removeClass("disabled"); >+ } else { >+ $(form).find(".selections").html(_("Select searches to: ")); >+ $(form).find(".selections-toolbar .links a").addClass("disabled"); >+ } >+} >+ > //]]> > > </script> >@@ -51,57 +95,73 @@ $(document).ready(function() { > [% IF ( current_biblio_searches ) %] > <h2>Current session</h2> > <form action="/cgi-bin/koha/catalogue/search-history.pl" method="get"> >+ <div class="selections-toolbar"> >+ <a class="CheckAll" href="#">Select all</a> >+ <a class="CheckNone" href="#">Clear all</a> >+ <span class="sep">|</span> >+ <span class="links"> >+ <span class="selections">Select searches to: </span> >+ <a href="#" class="action_delete disabled">Delete</a> >+ </span> >+ </div> > <input type="hidden" name="action" value="delete" /> >- <input type="hidden" name="previous" value="0" /> >- <input type="hidden" name="type" value="biblio" /> >- <input type="submit" class="deleteshelf" value="Delete your current catalog history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" /> >+ <table class="historyt"> >+ <thead> >+ <tr> >+ <th></th> >+ <th>Date</th> >+ <th>Search</th> >+ <th>Results</th> >+ </tr> >+ </thead> >+ <tbody> >+ [% FOREACH s IN current_biblio_searches %] >+ <tr> >+ <td><input type="checkbox" name="id" value="[% s.id %]" /></td> >+ <td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td> >+ <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td> >+ <td>[% s.total %]</td> >+ </tr> >+ [% END %] >+ </tbody> >+ </table> > </form> >- <table class="historyt"> >- <thead> >- <tr> >- <th>Date</th> >- <th>Search</th> >- <th>Results</th> >- </tr> >- </thead> >- <tbody> >- [% FOREACH s IN current_biblio_searches %] >- <tr> >- <td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td> >- <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td> >- <td>[% s.total %]</td> >- </tr> >- [% END %] >- </tbody> >- </table> > [% END %] > > [% IF ( previous_biblio_searches ) %] > <h2>Previous sessions</h2> > <form action="/cgi-bin/koha/catalogue/search-history.pl" method="get"> >+ <div class="selections-toolbar"> >+ <a class="CheckAll" href="#">Select all</a> >+ <a class="CheckNone" href="#">Clear all</a> >+ <span class="sep">|</span> >+ <span class="links"> >+ <span class="selections">Select searches to: </span> >+ <a href="#" class="action_delete disabled">Delete</a> >+ </span> >+ </div> > <input type="hidden" name="action" value="delete" /> >- <input type="hidden" name="previous" value="1" /> >- <input type="hidden" name="type" value="biblio" /> >- <input type="submit" class="deleteshelf" value="Delete your previous catalog search history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" /> >+ <table class="historyt"> >+ <thead> >+ <tr> >+ <th></th> >+ <th>Date</th> >+ <th>Search</th> >+ <th>Results</th> >+ </tr> >+ </thead> >+ <tbody> >+ [% FOREACH s IN previous_biblio_searches %] >+ <tr> >+ <td><input type="checkbox" name="id" value="[% s.id %]" /></td> >+ <td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td> >+ <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td> >+ <td>[% s.total %]</td> >+ </tr> >+ [% END %] >+ </tbody> >+ </table> > </form> >- <table class="historyt"> >- <thead> >- <tr> >- <th>Date</th> >- <th>Search</th> >- <th>Results</th> >- </tr> >- </thead> >- <tbody> >- [% FOREACH s IN previous_biblio_searches %] >- <tr> >- <td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td> >- <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td> >- <td>[% s.total %]</td> >- </tr> >- [% END %] >- </tbody> >- </table> > [% END %] > > [% IF !current_biblio_searches && !previous_biblio_searches %] >@@ -113,57 +173,73 @@ $(document).ready(function() { > [% IF ( current_authority_searches ) %] > <h2>Current session</h2> > <form action="/cgi-bin/koha/catalogue/search-history.pl" method="get"> >+ <div class="selections-toolbar"> >+ <a class="CheckAll" href="#">Select all</a> >+ <a class="CheckNone" href="#">Clear all</a> >+ <span class="sep">|</span> >+ <span class="links"> >+ <span class="selections">Select searches to: </span> >+ <a href="#" class="action_delete disabled">Delete</a> >+ </span> >+ </div> > <input type="hidden" name="action" value="delete" /> >- <input type="hidden" name="previous" value="0" /> >- <input type="hidden" name="type" value="authority" /> >- <input type="submit" class="deleteshelf" value="Delete your current authority search history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" /> >+ <table class="historyt"> >+ <thead> >+ <tr> >+ <th></th> >+ <th>Date</th> >+ <th>Search</th> >+ <th>Results</th> >+ </tr> >+ </thead> >+ <tbody> >+ [% FOREACH s IN current_authority_searches %] >+ <tr> >+ <td><input type="checkbox" name="id" value="[% s.id %]" /></td> >+ <td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td> >+ <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td> >+ <td>[% s.total %]</td> >+ </tr> >+ [% END %] >+ </tbody> >+ </table> > </form> >- <table class="historyt"> >- <thead> >- <tr> >- <th>Date</th> >- <th>Search</th> >- <th>Results</th> >- </tr> >- </thead> >- <tbody> >- [% FOREACH s IN current_authority_searches %] >- <tr> >- <td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td> >- <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td> >- <td>[% s.total %]</td> >- </tr> >- [% END %] >- </tbody> >- </table> > [% END %] > > [% IF ( previous_authority_searches ) %] > <h2>Previous sessions</h2> > <form action="/cgi-bin/koha/catalogue/search-history.pl" method="get"> >+ <div class="selections-toolbar"> >+ <a class="CheckAll" href="#">Select all</a> >+ <a class="CheckNone" href="#">Clear all</a> >+ <span class="sep">|</span> >+ <span class="links"> >+ <span class="selections">Select searches to: </span> >+ <a href="#" class="action_delete disabled">Delete</a> >+ </span> >+ </div> > <input type="hidden" name="action" value="delete" /> >- <input type="hidden" name="previous" value="1" /> >- <input type="hidden" name="type" value="authority" /> >- <input type="submit" class="deleteshelf" value="Delete your previous authority search history" onclick="return confirm(MSG_CONFIRM_DELETE_HISTORY);" /> >+ <table class="historyt"> >+ <thead> >+ <tr> >+ <th></th> >+ <th>Date</th> >+ <th>Search</th> >+ <th>Results</th> >+ </tr> >+ </thead> >+ <tbody> >+ [% FOREACH s IN previous_authority_searches %] >+ <tr> >+ <td><input type="checkbox" name="id" value="[% s.id %]" /></td> >+ <td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td> >+ <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td> >+ <td>[% s.total %]</td> >+ </tr> >+ [% END %] >+ </tbody> >+ </table> > </form> >- <table class="historyt"> >- <thead> >- <tr> >- <th>Date</th> >- <th>Search</th> >- <th>Results</th> >- </tr> >- </thead> >- <tbody> >- [% FOREACH s IN previous_authority_searches %] >- <tr> >- <td><span title="[% s.time %]">[% s.time |$KohaDates with_hours => 1 %]</span></td> >- <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi |html %]">[% s.query_desc |html %]</a></td> >- <td>[% s.total %]</td> >- </tr> >- [% END %] >- </tbody> >- </table> > [% END %] > > [% IF !current_authority_searches && !previous_authority_searches %] >-- >1.7.2.5
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 11430
:
23713
|
23714
|
23715
|
23716
|
23717
|
23718
|
25499
|
25500
|
25501
|
25502
|
25503
|
25504
|
25618
|
28636
|
28637
|
28638
|
28639
|
28640
|
28641
|
28642
|
29042
|
29043
|
29044
|
29045
|
29046
|
29047
|
29048
|
29059
|
29081
|
29082
|
29083
|
29084
|
29085
|
29106
|
29107
|
29108
|
29109
|
29110
|
29592
|
29635
|
29636
|
29637
|
29638
|
29639
|
29640
|
33831
|
33832
|
33833
|
33834
|
33835
|
33836
|
36444
|
36820
|
36821
|
36822