diff --git a/media/js/requests.js b/media/js/requests.js index 7c819332c529b3a1205b9341f247308c3159cf7c..165bf3c993de764f3ead894a80b3c31adfc07928 100644 --- a/media/js/requests.js +++ b/media/js/requests.js @@ -1,5 +1,5 @@ $(function () { - + var $statusFilter = $('#statusFilter'); $('.RequestTitle').click(function (e) { var currentID = e.target.id; @@ -7,15 +7,17 @@ $(function () { $(descriptionID).slideToggle(300); }); - $('#statusFilter').change(e => location.href = "?filter=" + $(e.target).val()); + var changeFilter = e => location.href = "?filter=" + $(e.target).val(); + $statusFilter.change(changeFilter); - $(".RequestStatus").change(function (e) { + $('.RequestStatus').change(function (e) { var requestId = e.target.id.replace('requestStatus', ''); var status = $(this).val(); var filter = $statusFilter.val(); var $statusSelect = $(this); var $issue = $("#requestIssue".concat(requestId)); - $statusSelect.prop( "disabled", true ); + + $statusSelect.turnOff(); $.postJSON(URLdir + 'handler/RequestsProcessing/setStatus', { requestID: requestId, @@ -27,14 +29,13 @@ $(function () { else Popup.error('Ошибка!'); }); - if (filter != 'all' && status != filter) - $issue.attr('style', 'border: 3px solid #B70400'); - else - $issue.attr('style', ''); + + var isSatisfyFilter = filter == 'all' || status == filter; + $issue.attr('style', isSatisfyFilter ? '' : 'border: 3px solid #B70400'); }); $('.RefreshButton').click(function () { $(this).attr('class', 'fa fa-refresh fa-spin fa-md RefreshButton'); - $statusFilter.change(); + changeFilter(); }); });