@@ -, +, @@ - Apply the patch and go to Circulation -> Article requests. - The page should show three tabs: New, Pending, and Processing. - The tabs should look correct and work correctly. - The DataTables under each tab should work correctly. --- .../prog/en/modules/circ/article-requests.tt | 659 +++++++++--------- 1 file changed, 330 insertions(+), 329 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt @@ -170,343 +170,344 @@
-
@@ -520,18 +521,18 @@ var active_tab = "#article-requests-requested"; var last_cancel_reason, requested_datatable, pending_datatable, processing_datatable, active_datatable; $(document).ready(function() { - $('#article-request-tabs').tabs({ - activate: function( activate_event, activate_ui ) { - active_tab = activate_ui.newPanel.selector; - if( active_tab == '#article-requests-requested' ) - active_datatable = requested_datatable; - else if( active_tab == '#article-requests-pending' ) - active_datatable = pending_datatable; - else active_datatable = processing_datatable; - activateBatchActions( active_tab ); - }, - }); + $("#article-request-tabs a[data-toggle='tab']").on("shown.bs.tab", function (e) { + active_tab = e.target.hash; + if( active_tab == "#article-requests-requested" ){ + active_datatable = requested_datatable; + } else if( active_tab == "#article-requests-pending" ){ + active_datatable = pending_datatable; + } else { + active_datatable = processing_datatable; + } + activateBatchActions( active_tab ); + }); $( "input:checkbox, #article-request-tabs" ).on("change", function(){ activateBatchActions( active_tab ); --