From 5d49969d0f7111504c2dcdc6ba375c182296b7a6 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 23 Apr 2024 17:39:06 +0000 Subject: [PATCH] Bug 36120: (QA follow-up) Tidy Signed-off-by: Nick Clemens --- .../data/mysql/atomicupdate/bug_36120.pl | 24 +++++++++++-------- .../prog/js/modals/place_booking.js | 24 ++++++++++--------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_36120.pl b/installer/data/mysql/atomicupdate/bug_36120.pl index a425df17032..9ed97b8ec44 100755 --- a/installer/data/mysql/atomicupdate/bug_36120.pl +++ b/installer/data/mysql/atomicupdate/bug_36120.pl @@ -8,26 +8,30 @@ return { my ( $dbh, $out ) = @$args{qw(dbh out)}; unless ( column_exists( 'bookings', 'pickup_library_id' ) ) { - $dbh->do(q{ + $dbh->do( + q{ ALTER TABLE bookings ADD COLUMN `pickup_library_id` varchar(10) DEFAULT NULL COMMENT 'Identifier for booking pickup library' AFTER `item_id`, ADD CONSTRAINT `bookings_ibfk_4` FOREIGN KEY (`pickup_library_id`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE - }); + } + ); - say $out "Added column 'bookings.pickup_library_id'"; + say $out "Added column 'bookings.pickup_library_id'"; - $dbh->do( - q{UPDATE bookings JOIN items ON bookings.item_id = items.itemnumber SET bookings.pickup_library_id = items.homebranch } - ); + $dbh->do( + q{UPDATE bookings JOIN items ON bookings.item_id = items.itemnumber SET bookings.pickup_library_id = items.homebranch } + ); - say $out "Set existing bookings pickup location to item homebranch"; + say $out "Set existing bookings pickup location to item homebranch"; - $dbh->do(q{ + $dbh->do( + q{ ALTER TABLE bookings MODIFY pickup_library_id varchar(10) NOT NULL COMMENT 'Identifier for booking pickup library' - }); + } + ); - say $out "Set pickup_library_id to NOT NULL"; + say $out "Set pickup_library_id to NOT NULL"; } }, }; diff --git a/koha-tmpl/intranet-tmpl/prog/js/modals/place_booking.js b/koha-tmpl/intranet-tmpl/prog/js/modals/place_booking.js index 51ced2a8a17..bd09384fb9b 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/modals/place_booking.js +++ b/koha-tmpl/intranet-tmpl/prog/js/modals/place_booking.js @@ -140,17 +140,21 @@ $("#placeBookingModal").on("show.bs.modal", function (e) { }); function setLocationsPicker(response) { let $pickupSelect = $("#pickup_library_id"); - let bookableItemnumbers = bookable_items.map(function(object) { return object.item_id; }); + let bookableItemnumbers = bookable_items.map(function (object) { + return object.item_id; + }); $pickupSelect.empty(); - $.each(response, function(index, pickup_location) { - if (containsAny(pickup_location.pickup_items, bookableItemnumbers)) { + $.each(response, function (index, pickup_location) { + if ( + containsAny(pickup_location.pickup_items, bookableItemnumbers) + ) { let option = $( '" + pickup_location.library_id + + '">' + + pickup_location.name + + "" ); option.attr( @@ -202,16 +206,15 @@ $("#placeBookingModal").on("show.bs.modal", function (e) { success: function (response) { if (dataFetched === true) { setLocationsPicker(response); - } else { - var interval = setInterval(function() { + var interval = setInterval(function () { if (dataFetched === true) { // Data is fetched, execute the callback and stop the interval setLocationsPicker(response); clearInterval(interval); } }, 100); - }; + } }, error: function (xhr, status, error) { console.log("Pickup location fetch failed: ", error); @@ -861,7 +864,6 @@ $("#placeBookingForm").on("submit", function (e) { }); $("#placeBookingModal").on("hidden.bs.modal", function (e) { - // Reset patron select $("#booking_patron_id").val(null).trigger("change"); $("#booking_patron_id").empty(); -- 2.39.2