From 21662f490b79d71b8e4329de8630854450b35038 Mon Sep 17 00:00:00 2001 From: David Cook Date: Thu, 22 Nov 2012 08:09:11 +1100 Subject: [PATCH] Bug 9130 - Remove old javascript from Parcel Content-Type: text/plain; charset="utf-8" When receiving orders, the old javascript would show the following above the tables for pending orders and received orders: "Only the first 5 items are displayed. Click here to show all 'X' items." With the implementation of the Jquery Datatables plugin, this text and the 4 JS functions associated with it are now pointless (since users should be using the datatable toolbar) and problematic. The problem is that the Jquery toolbar says "Showing 1 to 10 of X", while in fact it is actually only showing 5 items, because that other JS takes place after the Jquery. While not a crippling bug, it's certainly irritating and misleading. --- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 41 -------------------- 1 files changed, 0 insertions(+), 41 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index 833e606..ca6d273 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -13,7 +13,6 @@ dt_overwrite_html_sorting_localeCompare(); - var rowsToCollapse = 5; $(document).ready(function(){ var pendingt = $("#pendingt").dataTable($.extend(true, {}, dataTablesDefaults, { "aoColumnDefs": [ @@ -56,10 +55,6 @@ }); */ - rowCountPending = $("#pendingt tbody.filterclass tr").length; - rowCountReceived = $("#receivedt tbody.filterclass tr").length; - if (rowCountPending > rowsToCollapse ) { if ( $.cookie("pendingKeepExpanded") != 1 ) { pendingCollapse(); } else { pendingExpand(); } } - if (rowCountReceived > rowsToCollapse ) { if ( $.cookie("receivedKeepExpanded") != 1 ) { receivedCollapse(); } else { receivedExpand(); } } }); // Case-insensitive version of jquery's contains function @@ -72,42 +67,6 @@ containsExactly: "$(a).text() == m[3]" }); - - // Collapse pending items table - function pendingCollapse() { - $.cookie("pendingKeepExpanded", 0, { path: "/", expires: 9999 }); - $("#pendingcollapserow").remove(); - $("#pendingt tr").show(); - $("#pendingt tbody.filterclass tr:gt(" + (rowsToCollapse-1) + ")").hide(); - $("#pendingt").before("

" + _("Only the first ") + rowsToCollapse + _(" items are displayed.") + " " + _("Click here to show all ") + rowCountPending + _(" items") + "<\/a>.<\/p>"); - - } - - // Expend pending items table - function pendingExpand() { - $.cookie("pendingKeepExpanded", 1, { path: "/", expires: 9999 }); - $("#pendingcollapserow").remove(); - $("#pendingt tr").show(); - $("#pendingt tbody.filterclass tr.orderfound").remove(); - $("#pendingt").before("

" + rowCountPending + _(" items are displayed.") + " " + _("Click here to show only the first ") + rowsToCollapse + _(" items") + "<\/a>.<\/p>"); - } - - // Collapse already received items table - function receivedCollapse() { - $.cookie("receivedKeepExpanded", 0, { path: "/", expires: 9999 }); - $("#receivedcollapserow").remove(); - $("#receivedt tbody.filterclass tr:gt(" + (rowsToCollapse-1) + ")").hide(); - $("#receivedt").before("

" + _("Only the first ") + rowsToCollapse + _(" items are displayed.") + " " + _("Click here to show all ") + rowCountReceived + _(" items") + "<\/a>.<\/p>"); - } - - // Expand already received items table - function receivedExpand() { - $.cookie("receivedKeepExpanded", 1, { path: "/", expires: 9999 }); - $("#receivedcollapserow").remove(); - $("#receivedt tr").show(); - $("#receivedt").before("

" + _("All ") + rowCountReceived + _(" items are displayed.") + " " + _("Click here to show only the first ") + rowsToCollapse + _(" items") + "<\/a>.<\/p>"); - } - //]]>