From 1ec3053b879e8573e1a87f9120e6d3fcdcc76b3c Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Thu, 13 Oct 2016 11:05:00 +0200 Subject: [PATCH] Bug 14699: Reword "Select all/Clear all" and change their behaviour "Select all" -> "Select all visible rows" "Clear all" -> "Clear selection on visible rows" + fix the bug where the Delete link was visually enabled only if you checked a box in the first page (now every checkbox enable the link) Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart --- .../prog/en/modules/catalogue/search-history.tt | 33 +++++++++++++--------- 1 file changed, 19 insertions(+), 14 deletions(-) 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 1ae68e7..f55d4fc 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 @@ -25,7 +25,7 @@ $(document).ready(function() { // DataTables removes hidden rows from the DOM, so we can't expect a // "regular" submit to work and we need to build another form containing // all form elements, and then submit this form. - $('form').submit(function(e) { + $('#tabs form').submit(function(e) { e.preventDefault(); var form = $(this); @@ -49,19 +49,17 @@ $(document).ready(function() { $(".CheckNone").click(function(e){ e.preventDefault(); var form = $(this).parents("form").first(); - var table = form.find('table').dataTable(); - table.$('input[type="checkbox"]').attr('checked', false); + form.find('table input[type="checkbox"]').prop('checked', false); enableCheckboxActions(form); }); $(".CheckAll").click(function(e){ e.preventDefault(); var form = $(this).parents("form").first(); - var table = form.find('table').dataTable(); - table.$('input[type="checkbox"]').attr('checked', true); + form.find('table input[type="checkbox"]').prop('checked', true); enableCheckboxActions(form); }); - $("input:checkbox").click(function(){ + $('#tabs table').on('click', 'input:checkbox', function() { var form = $(this).parents("form").first(); enableCheckboxActions(form); }); @@ -88,6 +86,9 @@ $(document).ready(function() { return false; }); + $('#tabs form').each(function() { + enableCheckboxActions($(this)); + }); }); function enableCheckboxActions(form){ @@ -136,8 +137,9 @@ function enableCheckboxActions(form){

Current session

- Select all - Clear all + Select all visible rows + | + Clear selection on visible rows | Select searches to: @@ -172,8 +174,9 @@ function enableCheckboxActions(form){

Previous sessions

- Select all - Clear all + Select all visible rows + | + Clear selection on visible rows | Select searches to: @@ -214,8 +217,9 @@ function enableCheckboxActions(form){

Current session

- Select all - Clear all + Select all visible rows + | + Clear selection on visible rows | Select searches to: @@ -250,8 +254,9 @@ function enableCheckboxActions(form){

Previous sessions