diff options
author | Felipe Artur <fcardozo@gitlab.com> | 2018-07-30 13:44:41 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-07-30 13:44:41 +0000 |
commit | 5815c5b48ac03dbd89a239e87c0f49216a428563 (patch) | |
tree | 7af892c202f2e00ee79d2646d5429ee466ff3ded /app/assets/javascripts/boards/stores/boards_store.js | |
parent | 4f08343463d6a987ad3415d410b38b4f9dde67a2 (diff) | |
download | gitlab-ce-5815c5b48ac03dbd89a239e87c0f49216a428563.tar.gz |
[Backport] View summed weights of issues in board column
Diffstat (limited to 'app/assets/javascripts/boards/stores/boards_store.js')
-rw-r--r-- | app/assets/javascripts/boards/stores/boards_store.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/javascripts/boards/stores/boards_store.js b/app/assets/javascripts/boards/stores/boards_store.js index 333338489bc..76467564608 100644 --- a/app/assets/javascripts/boards/stores/boards_store.js +++ b/app/assets/javascripts/boards/stores/boards_store.js @@ -125,11 +125,17 @@ gl.issueBoards.BoardsStore = { } else if (listTo.type === 'backlog' && listFrom.type === 'assignee') { issue.removeAssignee(listFrom.assignee); listFrom.removeIssue(issue); - } else if ((listTo.type !== 'label' && listFrom.type === 'assignee') || - (listTo.type !== 'assignee' && listFrom.type === 'label')) { + } else if (this.shouldRemoveIssue(listFrom, listTo)) { listFrom.removeIssue(issue); } }, + shouldRemoveIssue(listFrom, listTo) { + return ( + (listTo.type !== 'label' && listFrom.type === 'assignee') || + (listTo.type !== 'assignee' && listFrom.type === 'label') || + (listFrom.type === 'backlog') + ); + }, moveIssueInList (list, issue, oldIndex, newIndex, idArray) { const beforeId = parseInt(idArray[newIndex - 1], 10) || null; const afterId = parseInt(idArray[newIndex + 1], 10) || null; |