diff options
author | Phil Hughes <me@iamphill.com> | 2017-03-09 12:32:43 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-03-09 12:32:43 +0000 |
commit | 7eabb7a9641481d89ccb52b421dcbd8cd63c3bb6 (patch) | |
tree | 2618dea650afc6bb1c238efdb8dffc64b1f84f15 /app/assets/javascripts/boards/components | |
parent | 236d6595edd2393f4ba4faadd39529fcabe48aec (diff) | |
download | gitlab-ce-7eabb7a9641481d89ccb52b421dcbd8cd63c3bb6.tar.gz |
Use reduce instead of a forEach
Changed an isArray check to use -1
Added comment to boards search manager to explain behaviour
Diffstat (limited to 'app/assets/javascripts/boards/components')
-rw-r--r-- | app/assets/javascripts/boards/components/board_card.js | 3 | ||||
-rw-r--r-- | app/assets/javascripts/boards/components/issue_card_inner.js | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/app/assets/javascripts/boards/components/board_card.js b/app/assets/javascripts/boards/components/board_card.js index 795b3cf2ec0..4b72090df31 100644 --- a/app/assets/javascripts/boards/components/board_card.js +++ b/app/assets/javascripts/boards/components/board_card.js @@ -17,7 +17,8 @@ export default { :list="list" :issue="issue" :issue-link-base="issueLinkBase" - :root-path="rootPath" /> + :root-path="rootPath" + :update-filters="true" /> </li> `, components: { diff --git a/app/assets/javascripts/boards/components/issue_card_inner.js b/app/assets/javascripts/boards/components/issue_card_inner.js index dce573ed6ca..3d57ec429c6 100644 --- a/app/assets/javascripts/boards/components/issue_card_inner.js +++ b/app/assets/javascripts/boards/components/issue_card_inner.js @@ -23,6 +23,11 @@ type: String, required: true, }, + updateFilters: { + type: Boolean, + required: false, + default: false, + }, }, methods: { showLabel(label) { @@ -31,6 +36,8 @@ return !this.list.label || label.id !== this.list.label.id; }, filterByLabel(label, e) { + if (!this.updateFilters) return; + const filterPath = gl.issueBoards.BoardsStore.filter.path.split('&'); const labelTitle = encodeURIComponent(label.title); const param = `label_name[]=${labelTitle}`; @@ -46,7 +53,8 @@ gl.issueBoards.BoardsStore.filter.path = filterPath.join('&'); Store.updateFiltersUrl(); - gl.boardsFilterManager.updateTokens(); + + gl.IssueBoardsApp.$emit('updateTokens'); }, labelStyle(label) { return { |