From e44ab46a793beff12b9f52071a2d95624a9dac90 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 19 Aug 2013 10:16:21 -0400 Subject: [PATCH] [SIGNED OFF] Bug 3134 [Follow-up] Ability to select multiple reports to delete at once This follow-up moves the checkboxes into a separate column from the report ID in order to prevent visual inconsistencies. To test, repeat the test plan from the original patch: You must have two or more saved reports to delete. Deletion should work properly when: - Selecting one report for deletion by checking the box. - Selecting more than one report for deletion by checking boxes. - Clicking the old "Delete" link Clicking the delete button should prompt you to confirm. Clicking cancel should cancel. Clicking the delete button when no boxes are checked should trigger an alert asking you to select reports for deletion. Signed-off-by: Katrin Fischer This works really nicely, passes all tests and the QA script. There is one little thing to note: If you delete a single report using the option from the menu, the line you want to delete is highlighted in red. It would be nice to do that also for deleting multiple reports. --- .../en/modules/reports/guided_reports_start.tt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt index 9f35e08..60bbe28 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -72,7 +72,7 @@ $(document).ready(function(){ 'iDisplayLength': 20, 'aaSorting': [[ 1, "asc" ]], 'aoColumnDefs': [ - { 'bSortable': false, 'bSearchable':false, 'aTargets': [-1, -2, -3, -4] }, + { 'bSortable': false, 'bSearchable':false, 'aTargets': [0, -1, -2, -3, -4] }, { 'bSearchable': false, 'aTargets': [3, 4] } ], 'oLanguage': { @@ -87,16 +87,16 @@ $(document).ready(function(){ $(this).remove(); } }); - rtable.fnFilter('', 3); rtable.fnFilter('', 4); - rtable.fnSetColumnVis(3, true); + rtable.fnFilter('', 5); rtable.fnSetColumnVis(4, true); + rtable.fnSetColumnVis(5, true); var g_id = $(ui.tab).attr('id') var g_name = $(ui.tab).text(); if (g_id && g_id.length > 0) { - rtable.fnFilter('^' + g_name + '$', 3, true, true, true, false); - rtable.fnSetColumnVis(3, false); + rtable.fnFilter('^' + g_name + '$', 4, true, true, true, false); + rtable.fnSetColumnVis(4, false); for(var i in group_subgroups[g_id]) { $("#subgroup_filter").append( '