diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-24 21:29:45 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-24 21:29:45 +0000 |
| commit | ed707dde8dbc7e568b1fecc827384d90abdc81c0 (patch) | |
| tree | c45df1df355356a5c9ecb814e63acc15b73fd40d /app/assets/javascripts/boards | |
| parent | 83d440760ff4f7594d9814945c07af2274e4e13d (diff) | |
| parent | 6a2ee01b552493da7753527b0de6cfb83b498622 (diff) | |
| download | gitlab-ce-ed707dde8dbc7e568b1fecc827384d90abdc81c0.tar.gz | |
Merge branch 'moving-issue-with-two-list-labels' into 'master'
Removes label from previous list
Closes #28484
See merge request !9418
Diffstat (limited to 'app/assets/javascripts/boards')
| -rw-r--r-- | app/assets/javascripts/boards/models/list.js.es6 | 12 | ||||
| -rw-r--r-- | app/assets/javascripts/boards/stores/boards_store.js.es6 | 5 |
2 files changed, 12 insertions, 5 deletions
diff --git a/app/assets/javascripts/boards/models/list.js.es6 b/app/assets/javascripts/boards/models/list.js.es6 index 5152be56b66..8158ed4ec2c 100644 --- a/app/assets/javascripts/boards/models/list.js.es6 +++ b/app/assets/javascripts/boards/models/list.js.es6 @@ -123,14 +123,18 @@ class List { if (listFrom) { this.issuesSize += 1; - gl.boardService.moveIssue(issue.id, listFrom.id, this.id) - .then(() => { - listFrom.getIssues(false); - }); + this.updateIssueLabel(issue, listFrom); } } } + updateIssueLabel(issue, listFrom) { + gl.boardService.moveIssue(issue.id, listFrom.id, this.id) + .then(() => { + listFrom.getIssues(false); + }); + } + findIssue (id) { return this.issues.filter(issue => issue.id === id)[0]; } diff --git a/app/assets/javascripts/boards/stores/boards_store.js.es6 b/app/assets/javascripts/boards/stores/boards_store.js.es6 index 50842ecbaaa..56436c8fdc7 100644 --- a/app/assets/javascripts/boards/stores/boards_store.js.es6 +++ b/app/assets/javascripts/boards/stores/boards_store.js.es6 @@ -92,9 +92,12 @@ const issueLists = issue.getLists(); const listLabels = issueLists.map(listIssue => listIssue.label); - // Add to new lists issues if it doesn't already exist if (!issueTo) { + // Add to new lists issues if it doesn't already exist listTo.addIssue(issue, listFrom, newIndex); + } else { + listTo.updateIssueLabel(issue, listFrom); + issueTo.removeLabel(listFrom.label); } if (listTo.type === 'done') { |