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 / +18 lines)
Lines 1-3 Link Here
1
[% USE AuthorisedValues %]
2
[% SET avs = AuthorisedValues.GetAuthValueDropbox('TICKET_RESOLUTION') %]
1
<!-- Display updates concern modal -->
3
<!-- Display updates concern modal -->
2
<div class="modal" id="ticketDetailsModal" tabindex="-1" role="dialog" aria-labelledby="ticketDetailsLabel">
4
<div class="modal" id="ticketDetailsModal" tabindex="-1" role="dialog" aria-labelledby="ticketDetailsLabel">
3
    <div class="modal-dialog modal-lg" role="document">
5
    <div class="modal-dialog modal-lg" role="document">
Lines 23-29 Link Here
23
            </div> <!-- /.modal-body -->
25
            </div> <!-- /.modal-body -->
24
            <div class="modal-footer">
26
            <div class="modal-footer">
25
                <input type="hidden" name="ticket_id" id="ticket_id">
27
                <input type="hidden" name="ticket_id" id="ticket_id">
26
                <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>
28
                [% IF avs.count %]
29
                <div class="btn-group">
30
                  <button type="button" class="btn btn-default dropdown-toggle" id="resolveTicket" data-toggle="dropdown" aria-expanded="false">
31
                    Resolve <span class="caret"></span> <i id="resolve-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i>
32
                  </button>
33
                  <ul class="dropdown-menu">
34
                    [% FOR av IN avs %]
35
                    <li>
36
                      <a class="dropdown-item resolveSubmit" type="button" data-resolution="[% av.authorised_value | html %]">[% av.lib | html_entity %]</a>
37
                    </li>
38
                    [% END %]
39
                  </ul>
40
                </div>
41
                [% ELSE %]
42
                <button type="button" class="btn btn-default resolveSubmit" id="resolveTicket">Resolve <i id="resolve-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i></button>
43
                [% END %]
27
                <button type="submit" class="btn btn-primary" id="updateTicket">Comment <i id="comment-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i></button>
44
                <button type="submit" class="btn btn-primary" id="updateTicket">Comment <i id="comment-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i></button>
28
            </div> <!-- /.modal-footer -->
45
            </div> <!-- /.modal-footer -->
29
        </div> <!-- /.modal-content -->
46
        </div> <!-- /.modal-content -->
(-)a/koha-tmpl/intranet-tmpl/prog/js/modals/display_ticket.js (-5 / +9 lines)
Lines 51-56 $(document).ready(function() { Link Here
51
                    display_cardnumber: false,
51
                    display_cardnumber: false,
52
                    url: true
52
                    url: true
53
                }) + ' (' + $datetime(item.date) + ')</span>';
53
                }) + ' (' + $datetime(item.date) + ')</span>';
54
                if ( item.status ) {
55
                    updates += '<span class="pull-right">' + item.status + '</span>'
56
                }
54
                updates += '</div>';
57
                updates += '</div>';
55
            });
58
            });
56
            updates_display.html(updates);
59
            updates_display.html(updates);
Lines 90-102 $(document).ready(function() { Link Here
90
        });
93
        });
91
    });
94
    });
92
95
93
    $('#ticketDetailsModal').on('click', '#resolveTicket', function(e) {
96
    $('#ticketDetailsModal').on('click', '.resolveSubmit', function(event) {
97
        let clicked = $(this);
94
        let ticket_id = $('#ticket_id').val();
98
        let ticket_id = $('#ticket_id').val();
95
        let params = {
99
        let params = {
96
            'public': $('#public').is(":checked"),
100
            'public': $('#public').is(":checked"),
97
            message: $('#update_message').val(),
101
            'message': $('#update_message').val(),
98
            user_id: logged_in_user_borrowernumber,
102
            'user_id': logged_in_user_borrowernumber,
99
            state: 'resolved'
103
            'state': 'resolved',
104
            'status': clicked.data('resolution')
100
        };
105
        };
101
106
102
        $('#resolve-spinner').show();
107
        $('#resolve-spinner').show();
103
- 

Return to bug 32435