From d1389fdd89baa1c1d91ca12f4e3bc7d26a57be74 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 14 Aug 2020 14:47:40 +0000 Subject: [PATCH] Bug 26214: Remove the use of jquery.checkboxes plugin on late orders page This patch replaces the use of the jquery.checkboxes plugin on late orders page in acquisitions. Unrelated changes: The "Check all" and "Uncheck all" links are moved out of the table header so that it matches similar interfaces. Sorting is now disabled on the checkboxes column and the table is sorted by default on the "Order line" column. To test, apply the patch and go to Acquisitions -> Late orders. - On the initial view, there should be no "Check all" or "Uncheck all" links. - Select a vendor in the left-hand sidebar form. - When the filtered table is redisplayed the "Check all" and "Uncheck all" links should now be visible. - Test that the links work correctly. - Confirm that the checkboxes column cannot be sorted and that the table is sorted by default by order line number. --- .../prog/en/modules/acqui/lateorders.tt | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt index cafaccaf84..e4c9a03719 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -50,14 +50,13 @@

[% END %] [% SET total = 0 %] + [% IF bookseller_filter %] +

Check all Uncheck all

+ [% END %] - [% IF bookseller_filter %] - - [% ELSE %] - - [% END %] + @@ -292,10 +291,11 @@ var columns_settings = [% TablesSettings.GetColumns( 'acqui', 'lateorders', 'late_orders', 'json' ) | $raw %]; late_orderst = KohaTable("late_orders", { "aoColumnDefs": [ - { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false }, + { "targets": [ "NoSort" ],"sortable": false,"searchable": false }, { "sType": "anti-the", "aTargets" : [ "anti-the" ] }, { "sType": "title-string", "aTargets" : [ "title-string" ] } ], + "sorting": [[ 1, "asc" ]], "sPaginationType": "full", "bAutoWidth": false, "fnDrawCallback": function() { @@ -306,8 +306,14 @@ } }, columns_settings ); $('input:checkbox[name=ordernumber]').bind('click', check_uncheck); - $('#CheckAll').click(function(){ $(late_orderst.fnGetNodes()).find("td").checkCheckboxes();}); - $('#CheckNone').click(function(){ $(late_orderst.fnGetNodes()).find("td").unCheckCheckboxes();}); + $('#CheckAll').click(function(e){ + e.preventDefault(); + $("#late_orders input:checkbox").prop("checked", true); + }); + $('#CheckNone').click(function(e){ + e.preventDefault(); + $("#late_orders input:checkbox").prop("checked", false); + }); // Generates a dynamic link for exporting the selection's data as CSV $("#exportbutton, #export-csv-menu a").click(function() { -- 2.11.0
Check all
Uncheck all
Order line Order date Estimated delivery date