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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tt (-1 / +1 lines)
Lines 47-53 Link Here
47
    [% IF ( unknownbiblionumber ) %]
47
    [% IF ( unknownbiblionumber ) %]
48
        <div class="dialog message">The record you requested does not exist ([% biblionumber | html %]).</div>
48
        <div class="dialog message">The record you requested does not exist ([% biblionumber | html %]).</div>
49
    [% ELSE %]
49
    [% ELSE %]
50
50
                <div id="transient_result"></div>
51
                [% INCLUDE 'cat-toolbar.inc' %]
51
                [% INCLUDE 'cat-toolbar.inc' %]
52
52
53
                <h1>
53
                <h1>
(-)a/koha-tmpl/intranet-tmpl/prog/js/place_booking_modal.js (-7 / +3 lines)
Lines 290-296 $('#placeBookingModal').on('show.bs.modal', function(e) { Link Here
290
                                // cases where an item must be used for a biblio level booking
290
                                // cases where an item must be used for a biblio level booking
291
                                // due to all other items being booking within the biblio level
291
                                // due to all other items being booking within the biblio level
292
                                // booking period... we end up with a clash
292
                                // booking period... we end up with a clash
293
                                // To reproduce: 
293
                                // To reproduce:
294
                                // * One bib with two bookable items.
294
                                // * One bib with two bookable items.
295
                                // * Add item level booking
295
                                // * Add item level booking
296
                                // * Add biblio level booking that extends one day beyond the item level booking
296
                                // * Add biblio level booking that extends one day beyond the item level booking
Lines 490-496 $("#placeBookingForm").on('submit', function(e) { Link Here
490
            $('.bookings_count').html(parseInt($('.bookings_count').html(), 10)+1);
490
            $('.bookings_count').html(parseInt($('.bookings_count').html(), 10)+1);
491
491
492
            // Set feedback
492
            // Set feedback
493
            $('#transient_result').replaceWith('<div id="transient_result" class="dialog success">'+_("Booking successfully placed")+'</div>');
493
            $('#transient_result').replaceWith('<div id="transient_result" class="dialog message">'+_("Booking successfully placed")+'</div>');
494
494
495
            // Close modal
495
            // Close modal
496
            $('#placeBookingModal').modal('hide');
496
            $('#placeBookingModal').modal('hide');
Lines 543-554 $("#placeBookingForm").on('submit', function(e) { Link Here
543
                timeline.focus(data.booking_id);
543
                timeline.focus(data.booking_id);
544
            }
544
            }
545
545
546
<<<<<<< HEAD
547
=======
548
            // Set feedback
546
            // Set feedback
549
            $('#transient_result').replaceWith('<div id="transient_result" class="dialog success">'+_("Booking successfully updated")+'</div>');
547
            $('#transient_result').replaceWith('<div id="transient_result" class="dialog message">'+_("Booking successfully updated")+'</div>');
550
548
551
>>>>>>> 9195757e2f1 (Bug 35813: Add success feedback after placing/editing bookings)
552
            // Close modal
549
            // Close modal
553
            $('#placeBookingModal').modal('hide');
550
            $('#placeBookingModal').modal('hide');
554
        });
551
        });
555
- 

Return to bug 35813