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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/display_ticket.inc (-1 / +17 lines)
Lines 1-5 Link Here
1
[% USE AuthorisedValues %]
1
[% USE AuthorisedValues %]
2
[% SET status = AuthorisedValues.GetAuthValueDropbox('TICKET_STATUS') %]
2
[% SET status = AuthorisedValues.GetAuthValueDropbox('TICKET_STATUS') %]
3
[% SET resolutions = AuthorisedValues.GetAuthValueDropbox('TICKET_RESOLUTION') %]
3
<!-- Display updates concern modal -->
4
<!-- Display updates concern modal -->
4
<div class="modal" id="ticketDetailsModal" tabindex="-1" role="dialog" aria-labelledby="ticketDetailsLabel">
5
<div class="modal" id="ticketDetailsModal" tabindex="-1" role="dialog" aria-labelledby="ticketDetailsLabel">
5
    <div class="modal-dialog modal-lg" role="document">
6
    <div class="modal-dialog modal-lg" role="document">
Lines 25-31 Link Here
25
            </div> <!-- /.modal-body -->
26
            </div> <!-- /.modal-body -->
26
            <div class="modal-footer">
27
            <div class="modal-footer">
27
                <input type="hidden" name="ticket_id" id="ticket_id">
28
                <input type="hidden" name="ticket_id" id="ticket_id">
28
                <button type="button" class="btn btn-default" id="resolveTicket">Resolve <i id="resolve-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i></button>
29
                [% IF resolutions.count %]
30
                <div class="btn-group">
31
                  <button type="button" class="btn btn-danger dropdown-toggle" id="resolveTicket" data-toggle="dropdown" aria-expanded="false">
32
                    Resolve <span class="caret"></span> <i id="resolve-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i>
33
                  </button>
34
                  <ul class="dropdown-menu">
35
                    [% FOR resolution IN resolutions %]
36
                    <li>
37
                      <a class="dropdown-item resolveSubmit" type="button" data-resolution="[% resolution.authorised_value | html %]">[% resolution.lib | html_entity %]</a>
38
                    </li>
39
                    [% END %]
40
                  </ul>
41
                </div>
42
                [% ELSE %]
43
                <button type="button" class="btn btn-danger resolveSubmit" id="resolveTicket">Resolve <i id="resolve-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i></button>
44
                [% END %]
29
                [% IF status.count %]
45
                [% IF status.count %]
30
                <div class="btn-group">
46
                <div class="btn-group">
31
                  <button type="button" class="btn btn-primary" id="updateTicket">Update <i id="comment-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i></button>
47
                  <button type="button" class="btn btn-primary" id="updateTicket">Update <i id="comment-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i></button>
(-)a/koha-tmpl/intranet-tmpl/prog/js/modals/display_ticket.js (-5 / +6 lines)
Lines 95-107 $(document).ready(function() { Link Here
95
        });
95
        });
96
    });
96
    });
97
97
98
    $('#ticketDetailsModal').on('click', '#resolveTicket', function(e) {
98
    $('#ticketDetailsModal').on('click', '.resolveSubmit', function(e) {
99
        let clicked = $(this);
99
        let ticket_id = $('#ticket_id').val();
100
        let ticket_id = $('#ticket_id').val();
100
        let params = {
101
        let params = {
101
            'public': $('#public').is(":checked"),
102
            'public': $('#public').is(":checked"),
102
            message: $('#update_message').val(),
103
            'message': $('#update_message').val(),
103
            user_id: logged_in_user_borrowernumber,
104
            'user_id': logged_in_user_borrowernumber,
104
            state: 'resolved',
105
            'state': 'resolved',
106
            'status': clicked.data('resolution')
105
        };
107
        };
106
108
107
        $('#resolve-spinner').show();
109
        $('#resolve-spinner').show();
108
- 

Return to bug 32435