From 89afb6072887b1cd8ec2da60674eb41591fc6ab9 Mon Sep 17 00:00:00 2001 From: David Cook Date: Wed, 23 Apr 2014 15:54:36 +1000 Subject: [PATCH] [PASSED QA] Bug 12127 - Incorrect DataTable types in Holds to Pull list This patch explicitly sets the sType in the Holds to Pull list table for the libraries, itypes, and locations columns. It appears that the type is automatically being set to "html" when it should be set to "string". It needs to have a sType of "string", since DataTables will strip out the
tags when using "html", and we need them for the regexp we use to create a more precise filter search. _TEST PLAN_ Before applying: 1) Place a "next available" hold on a record with an item available from one library/branch (e.g. "Branch A") 2) Place a "next available" hold on a record with an item available from two different libraries/branches 3) Place a "next available" hold on a record with an item available from three different libraries/branches - one of which is the same as the library/branch from Step 1. 4) Go to the Holds to Pull List 5) Filter the branches by "Branch A". 6) You should only see the hold from Step 1 - not Step 3. 7) Try filtering on a branch for a hold that has multiple libraries/branches. (They shouldn't appear when filtering, except when using the "None" filter). Apply the patch. After applying: 1) Repeat Steps 4-7 from above. When filtering on "Branch A", you should be able to see all holds that are available at "Branch A", even if they are available at other branches (i.e. the holds has multiple libraries listed). Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall --- .../prog/en/modules/circ/pendingreserves.tt | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt index 78df0e4..6a49e1c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt @@ -12,6 +12,9 @@ $(document).ready(function() { dt_add_type_uk_date(); [% END %] var holdst = $("#holdst").dataTable($.extend(true, {}, dataTablesDefaults, { + "aoColumnDefs": [ + { "sType": "string", "aTargets": [ 4, 8, 9 ] } //Target columns that use
separators and pull-down menus. FIXME: Use class names instead of indexes. + ] })); holdst.fnAddFilters("filter"); [%# add separateData function to cleanse jQuery select lists by breaking apart strings glued with BR tags and then de-duplicating any repeated library codes %] -- 1.7.2.5