diff options
author | Phil Hughes <me@iamphill.com> | 2017-03-07 11:05:37 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-03-08 08:48:59 +0000 |
commit | f89782b3f25984794f4f9752979c05d5ed6f0a96 (patch) | |
tree | 7d36a202aa0c068224ffe5bac56681dab9953bfc /app/assets/javascripts/boards/models | |
parent | 850f19c02c53648b16a531a81586c05edcfa7530 (diff) | |
download | gitlab-ce-f89782b3f25984794f4f9752979c05d5ed6f0a96.tar.gz |
Changed store
Async updates the boards when searching
Diffstat (limited to 'app/assets/javascripts/boards/models')
-rw-r--r-- | app/assets/javascripts/boards/models/list.js | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/app/assets/javascripts/boards/models/list.js b/app/assets/javascripts/boards/models/list.js index f237567208c..ae117aa3900 100644 --- a/app/assets/javascripts/boards/models/list.js +++ b/app/assets/javascripts/boards/models/list.js @@ -10,7 +10,7 @@ class List { this.title = obj.title; this.type = obj.list_type; this.preset = ['done', 'blank'].indexOf(this.type) > -1; - this.filters = gl.issueBoards.BoardsStore.state.filters; + this.filterPath = gl.issueBoards.BoardsStore.filter.path; this.page = 1; this.loading = true; this.loadingMore = false; @@ -65,12 +65,24 @@ class List { } getIssues (emptyIssues = true) { - const filters = this.filters; const data = { page: this.page }; + gl.issueBoards.BoardsStore.filter.path.split('&').forEach((filterParam) => { + const paramSplit = filterParam.split('='); + const paramKeyNormalized = paramSplit[0].replace('[]', ''); + const isArray = paramSplit[0].indexOf('[]'); + + if (isArray >= 0) { + if (!data[paramKeyNormalized]) { + data[paramKeyNormalized] = []; + } - Object.keys(filters).forEach((key) => { data[key] = filters[key]; }); + data[paramKeyNormalized].push(paramSplit[1]); + } else { + data[paramKeyNormalized] = paramSplit[1]; + } + }); - if (this.label) { + if (this.label && data.label_name) { data.label_name = data.label_name.filter(label => label !== this.label.title); } |