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

(-)a/Koha/REST/V1/Tickets.pm (+6 lines)
Lines 220-225 sub add_update { Link Here
220
            )->store;
220
            )->store;
221
        }
221
        }
222
222
223
        # Update ticket status if needed
224
        if ( $ticket_update->{status} ) {
225
            my $ticket = $update->ticket;
226
            $ticket->set( { status => $ticket_update->{status} } )->store;
227
        }
228
223
        # Optionally add to message_queue here to notify reporter
229
        # Optionally add to message_queue here to notify reporter
224
        if ( $update->public ) {
230
        if ( $update->public ) {
225
            my $notice =
231
            my $notice =
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/display_ticket.inc (-1 / +20 lines)
Lines 1-3 Link Here
1
[% USE AuthorisedValues %]
2
[% SET status = AuthorisedValues.GetAuthValueDropbox('TICKET_STATUS') %]
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 24-30 Link Here
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
                <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>
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>
29
                [% IF status.count %]
30
                <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>
32
                  <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
33
                    <span class="caret"></span>
34
                    <span class="sr-only">Select status</span>
35
                  </button>
36
                  <ul class="dropdown-menu">
37
                    [% FOR st IN status %]
38
                    <li>
39
                      <a class="dropdown-item updateSubmit" type="button" data-status="[% st.authorised_value | html %]">[% st.lib | html_entity %]</a>
40
                    </li>
41
                    [% END %]
42
                  </ul>
43
                </div>
44
                [% ELSE %]
45
                <button type="submit" class="btn btn-primary updateSubmit" id="updateTicket">Update <i id="comment-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i></button>
46
                [% END %]
28
            </div> <!-- /.modal-footer -->
47
            </div> <!-- /.modal-footer -->
29
        </div> <!-- /.modal-content -->
48
        </div> <!-- /.modal-content -->
30
    </div> <!-- /.modal-dialog -->
49
    </div> <!-- /.modal-dialog -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt (-2 / +6 lines)
Lines 156-162 Link Here
156
                        "orderable": true
156
                        "orderable": true
157
                    },
157
                    },
158
                    {
158
                    {
159
                        "data": "resolver.firstname:resolver.surname:resolved_date",
159
                        "data": "resolver.firstname:resolver.surname:resolved_date:status",
160
                        "render": function(data, type, row, meta) {
160
                        "render": function(data, type, row, meta) {
161
                            let result = '';
161
                            let result = '';
162
                            if (row.resolved_date) {
162
                            if (row.resolved_date) {
Lines 166-172 Link Here
166
                                }) + '</span>';
166
                                }) + '</span>';
167
                                result += '<span class="clearfix">' + $datetime(row.resolved_date) + '</span>';
167
                                result += '<span class="clearfix">' + $datetime(row.resolved_date) + '</span>';
168
                            } else {
168
                            } else {
169
                                result += _("Open");
169
                                if (row.status) {
170
                                    result += row.status;
171
                                } else {
172
                                    result += _("Open");
173
                                }
170
                            }
174
                            }
171
                            return result;
175
                            return result;
172
                        },
176
                        },
(-)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 63-74 $(document).ready(function() { Link Here
63
        $('#public').prop( "checked", false );
66
        $('#public').prop( "checked", false );
64
    });
67
    });
65
68
66
    $('#ticketDetailsModal').on('click', '#updateTicket', function(e) {
69
    $('#ticketDetailsModal').on('click', '.updateSubmit', function(e) {
70
        let clicked = $(this);
67
        let ticket_id = $('#ticket_id').val();
71
        let ticket_id = $('#ticket_id').val();
68
        let params = {
72
        let params = {
69
            'public': $('#public').is(":checked"),
73
            'public': $('#public').is(":checked"),
70
            message: $('#update_message').val(),
74
            'message': $('#update_message').val(),
71
            user_id: logged_in_user_borrowernumber
75
            'user_id': logged_in_user_borrowernumber,
76
            'status': clicked.data('status')
72
        };
77
        };
73
78
74
        $('#comment-spinner').show();
79
        $('#comment-spinner').show();
Lines 96-102 $(document).ready(function() { Link Here
96
            'public': $('#public').is(":checked"),
101
            'public': $('#public').is(":checked"),
97
            message: $('#update_message').val(),
102
            message: $('#update_message').val(),
98
            user_id: logged_in_user_borrowernumber,
103
            user_id: logged_in_user_borrowernumber,
99
            state: 'resolved'
104
            state: 'resolved',
100
        };
105
        };
101
106
102
        $('#resolve-spinner').show();
107
        $('#resolve-spinner').show();
103
- 

Return to bug 35628