View | Details | Raw Unified | Return to bug 36120
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/bookings/list.tt (-2 / +3 lines)
Lines 106-111 Link Here
106
                        id: booking.booking_id,
106
                        id: booking.booking_id,
107
                        booking: booking.booking_id,
107
                        booking: booking.booking_id,
108
                        patron: booking.patron_id,
108
                        patron: booking.patron_id,
109
                        pickup_library: booking.pickup_library_id,
109
                        start: dayjs(booking.start_date).toDate(),
110
                        start: dayjs(booking.start_date).toDate(),
110
                        end: dayjs(booking.end_date).toDate(),
111
                        end: dayjs(booking.end_date).toDate(),
111
                        content: $patron_to_html(booking.patron, {
112
                        content: $patron_to_html(booking.patron, {
Lines 167-173 Link Here
167
                        // set end datetime hours and minutes to the end of the day
168
                        // set end datetime hours and minutes to the end of the day
168
                        let endDate = dayjs(data.end).endOf('day');
169
                        let endDate = dayjs(data.end).endOf('day');
169
170
170
                        $('#placeBookingModal').modal('show', $('<button data-booking="'+data.id+'"  data-biblionumber="[% biblionumber | uri %]"  data-itemnumber="'+data.group+'" data-patron="'+data.patron+'" data-start_date="'+startDate.toISOString()+'" data-end_date="'+endDate.toISOString()+'">'));
171
                        $('#placeBookingModal').modal('show', $('<button data-booking="'+data.id+'"  data-biblionumber="[% biblionumber | uri %]"  data-itemnumber="'+data.group+'" data-patron="'+data.patron+'" data-pickup_library="'+data.pickup_library+'" data-start_date="'+startDate.toISOString()+'" data-end_date="'+endDate.toISOString()+'">'));
171
                        $('#placeBookingModal').on('hide.bs.modal', function(e) {
172
                        $('#placeBookingModal').on('hide.bs.modal', function(e) {
172
                            if (update_success) {
173
                            if (update_success) {
173
                                update_success = 0;
174
                                update_success = 0;
Lines 273-279 Link Here
273
                "render": function(data, type, row, meta) {
274
                "render": function(data, type, row, meta) {
274
                    let result = "";
275
                    let result = "";
275
                    [% IF CAN_user_circulate_manage_bookings %]
276
                    [% IF CAN_user_circulate_manage_bookings %]
276
                    result += '<button type="button" class="btn btn-default btn-xs edit-action" data-toggle="modal" data-target="#placeBookingModal" data-booking="'+row.booking_id+'" data-biblionumber="[% biblionumber | uri %]" data-itemnumber="'+row.item_id+'" data-patron="'+row.patron_id+'" data-start_date="'+row.start_date+'" data-end_date="'+row.end_date+'"><i class="fa fa-pencil" aria-hidden="true"></i> '+_("Edit")+'</button>';
277
                    result += '<button type="button" class="btn btn-default btn-xs edit-action" data-toggle="modal" data-target="#placeBookingModal" data-booking="'+row.booking_id+'" data-biblionumber="[% biblionumber | uri %]" data-itemnumber="'+row.item_id+'" data-patron="'+row.patron_id+'" data-pickup_library="'+row.pickup_library_id+'" data-start_date="'+row.start_date+'" data-end_date="'+row.end_date+'"><i class="fa fa-pencil" aria-hidden="true"></i> '+_("Edit")+'</button>';
277
                    result += '<button type="button" class="btn btn-default btn-xs cancel-action" data-toggle="modal" data-target="#cancelBookingModal" data-booking="'+row.booking_id+'"><i class="fa fa-trash" aria-hidden="true"></i> '+_("Cancel")+'</button>';
278
                    result += '<button type="button" class="btn btn-default btn-xs cancel-action" data-toggle="modal" data-target="#cancelBookingModal" data-booking="'+row.booking_id+'"><i class="fa fa-trash" aria-hidden="true"></i> '+_("Cancel")+'</button>';
278
                    [% END %]
279
                    [% END %]
279
                    return result;
280
                    return result;
(-)a/koha-tmpl/intranet-tmpl/prog/js/modals/place_booking.js (-2 / +8 lines)
Lines 31-36 $("#placeBookingModal").on("show.bs.modal", function (e) { Link Here
31
    $("#booking_biblio_id").val(biblionumber);
31
    $("#booking_biblio_id").val(biblionumber);
32
32
33
    let patron_id = button.data("patron") || 0;
33
    let patron_id = button.data("patron") || 0;
34
    let pickup_library_id = button.data("pickup_library");
34
    booking_item_id = button.data("itemnumber");
35
    booking_item_id = button.data("itemnumber");
35
    let start_date = button.data("start_date");
36
    let start_date = button.data("start_date");
36
    let end_date = button.data("end_date");
37
    let end_date = button.data("end_date");
Lines 166-172 $("#placeBookingModal").on("show.bs.modal", function (e) { Link Here
166
        });
167
        });
167
168
168
        $pickupSelect.prop("disabled", false);
169
        $pickupSelect.prop("disabled", false);
169
        $pickupSelect.val(null).trigger("change");
170
171
        // If pickup_library alread exists, pre-select
172
        if (pickup_library_id) {
173
            $pickupSelect.val(pickup_library_id).trigger("change");
174
        } else {
175
            $pickupSelect.val(null).trigger("change");
176
        }
170
    }
177
    }
171
178
172
    // Item select2
179
    // Item select2
173
- 

Return to bug 36120