diff options
| author | Phil Hughes <me@iamphill.com> | 2016-08-08 09:24:29 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-08-17 17:12:47 +0100 |
| commit | df7ebcba6e605e430b30f8c9fddaa6329deb9bfe (patch) | |
| tree | 5a933b57418b7ac178b3ffe973cc9ba1d440ae77 /app | |
| parent | aaf176f2c1cd618e56e08ac67e10cfe79fb402ee (diff) | |
| download | gitlab-ce-df7ebcba6e605e430b30f8c9fddaa6329deb9bfe.tar.gz | |
Fixed filter by any label
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/boards/stores/boards_store.js.es6 | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/labels_select.js | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/boards/stores/boards_store.js.es6 b/app/assets/javascripts/boards/stores/boards_store.js.es6 index fcd5ada2265..daa41056dc7 100644 --- a/app/assets/javascripts/boards/stores/boards_store.js.es6 +++ b/app/assets/javascripts/boards/stores/boards_store.js.es6 @@ -18,7 +18,6 @@ if (persist) { list.save(); this.removeBlankState(); - this.updateNewListDropdown(); } return list; diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js index 3977cf15bd2..bee37182d4d 100644 --- a/app/assets/javascripts/labels_select.js +++ b/app/assets/javascripts/labels_select.js @@ -304,7 +304,9 @@ isIssueIndex = page === 'projects:issues:index'; isMRIndex = page === 'projects:merge_requests:index'; if (page === 'projects:boards:show') { - if (label.title) { + if (label.isAny) { + BoardsStore.state.filters['label_name'] = []; + } else if (label.title) { BoardsStore.state.filters['label_name'].push(label.title); } else { var labelIndex = BoardsStore.state.filters['label_name'].indexOf(label.text()); |