From d3a3617599fab87cf5d1b4628ab110d955ac6dbf Mon Sep 17 00:00:00 2001
From: PavelBegunkov <asml.silence@gmail.com>
Date: Tue, 26 Jul 2016 15:02:10 +0300
Subject: [PATCH] Fix missing $statusFilter
---
media/js/requests.js | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/media/js/requests.js b/media/js/requests.js
index 7c819332c..165bf3c99 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();
});
});
--
GitLab