From 0fe0bfff60ce54d5e18dfa336f58a37c35b72f44 Mon Sep 17 00:00:00 2001 From: Bouzid Fergani Date: Tue, 12 Apr 2016 09:27:18 -0400 Subject: [PATCH] Bug 15636 - DataTables Warning: Requested unknown parameter from opac-detail.tt MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Srdjan Signed-off-by: Jonathan Druart This patch adds the same tests in the aoColumns DT definition than the ones in the creation of the table. That's sound good. Signed-off-by: Kyle M Hall (cherry picked from commit a12d3d1bfa00499a0b16d39f01136050de537449) Signed-off-by: Frédéric Demians (cherry picked from commit 57a727afa5b4a8fa9f7a8d4e4257c7e172ed1f6d) Signed-off-by: Julian Maurice --- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt index 7cc0f49c67..323325d9f5 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -1430,8 +1430,10 @@ $(".holdingst").dataTable($.extend(true, {}, dataTablesDefaults, { "aoColumns": [ [% IF ( item_level_itypes ) %]null,[% END %] - null, - [% IF ( OpacLocationBranchToDisplay == 'both' ) %]null,[% END %] + [% IF ( OpacLocationBranchToDisplay == 'holding' || OpacLocationBranchToDisplay == 'both' || singleBranchMode ) %]null,[% END %] + [% UNLESS ( singleBranchMode ) %] + [% IF ( OpacLocationBranchToDisplay == 'home' || OpacLocationBranchToDisplay == 'both' ) %]null,[% END %] + [% END %] [% IF ( itemdata_ccode ) %]null,[% END %] null, [% IF ( itemdata_enumchron ) %]null,[% END %] -- 2.39.5