diff options
| -rw-r--r-- | server/sonar-web/src/main/js/main/processes.js | 4 | ||||
| -rw-r--r-- | server/sonar-web/src/main/js/widgets/issue-filter/widget.js | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/server/sonar-web/src/main/js/main/processes.js b/server/sonar-web/src/main/js/main/processes.js index b884ee74bd2..6c1d8b42991 100644 --- a/server/sonar-web/src/main/js/main/processes.js +++ b/server/sonar-web/src/main/js/main/processes.js @@ -154,9 +154,9 @@ function failBackgroundProcess (uid, message) { * @param jqXHR */ function handleAjaxError (jqXHR) { - if (jqXHR.processId != null) { + if (jqXHR != null && jqXHR.processId != null) { let message = null; - if (jqXHR != null && jqXHR.responseJSON != null && jqXHR.responseJSON.errors != null) { + if (jqXHR.responseJSON != null && jqXHR.responseJSON.errors != null) { message = _.pluck(jqXHR.responseJSON.errors, 'msg').join('. '); } failBackgroundProcess(jqXHR.processId, message); diff --git a/server/sonar-web/src/main/js/widgets/issue-filter/widget.js b/server/sonar-web/src/main/js/widgets/issue-filter/widget.js index da6b2f1ca77..0b135064a3f 100644 --- a/server/sonar-web/src/main/js/widgets/issue-filter/widget.js +++ b/server/sonar-web/src/main/js/widgets/issue-filter/widget.js @@ -39,8 +39,7 @@ const defaultComparator = function (item) { const defaultFilter = function (item) { const items = this.query[this.property]; - return items == null || - (items != null && items.split(',').indexOf(item.val) !== -1); + return items == null || items.split(',').indexOf(item.val) !== -1; }; const defaultLabel = function (item) { |