From 81aa1664fceec84ebe4a7e01d5892f833d5eb2d7 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 9 Sep 2022 12:52:15 +0000 Subject: [PATCH] Bug 30309: Convert lists tabs in the staff interface to Bootstrap This patch updates the staff interface lists page to use Bootstrap tabs instead of jQueryUI. To test, apply the patch and go to Lists. - Test that the public and private tabs work correctly. - Test that other lists functionality still works as expected. - Confirm that adding the "public" URL parameter works to trigger the "Public lists" tab by default: /cgi-bin/koha/virtualshelves/shelves.pl?public=1 --- .../prog/en/modules/virtualshelves/shelves.tt | 118 +++++++++--------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt index 3c1e4c7e5e..cb62f8cf1c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -486,53 +486,55 @@ [% IF op == 'list' %]

Lists

-
[% END # /IF op == 'list' %] @@ -686,23 +688,21 @@ dtListResults.fnAddFilters("filter", 750); - var tabs = $("#tabs").tabs({ - [% IF public %] - active: 1, - [% ELSE %] - active: 0, - [% END %] - activate: function(e, ui) { - var active = tabs.tabs("option", "active" ); - if ( active == 0 ) { - public = 0; - dtListResults.fnDraw(); - } else if ( active == 1 ) { - public = 1; - dtListResults.fnDraw(); - } - } + /* Select correct tab based on URL parameter */ + if( public == 0 ){ + $('#privateshelves_tab').tab('show'); + } else { + $("#publicshelves_tab").tab("show"); + } + + $('a[data-toggle="tab"]') + .on("click", function(){ + public = $(this).data("public"); + }) + .on('shown.bs.tab', function (e) { + dtListResults.fnDraw(); }); + $("body").on("click", ".deleteshelf", function(){ return confirmDelete(MSG_CONFIRM_DELETE_LIST); }); -- 2.20.1