summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/boards/stores
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-08-12 10:44:14 +0100
committerPhil Hughes <me@iamphill.com>2016-08-17 17:17:39 +0100
commit86a6d4d8c55a9dd5e1b7a413a29dcc84a3d5540b (patch)
treec7bfbc9c14094cacf6712f834d6ff2cbb150f17f /app/assets/javascripts/boards/stores
parent19afb1e7239db59737acab70be95c520bea4f6f8 (diff)
downloadgitlab-ce-86a6d4d8c55a9dd5e1b7a413a29dcc84a3d5540b.tar.gz
Fixed bug when dragging to done list
Diffstat (limited to 'app/assets/javascripts/boards/stores')
-rw-r--r--app/assets/javascripts/boards/stores/boards_store.js.es68
1 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/boards/stores/boards_store.js.es6 b/app/assets/javascripts/boards/stores/boards_store.js.es6
index ffeea107a6e..c32c870fa3f 100644
--- a/app/assets/javascripts/boards/stores/boards_store.js.es6
+++ b/app/assets/javascripts/boards/stores/boards_store.js.es6
@@ -99,8 +99,8 @@
listFrom.update();
},
moveCardToList (listFromId, listToId, issueId) {
- const listFrom = this.findList('id', listFromId),
- listTo = this.findList('id', listToId),
+ const listFrom = this.findList('id', listFromId, false),
+ listTo = this.findList('id', listToId, false),
issueTo = listTo.findIssue(issueId),
issue = listFrom.findIssue(issueId),
issueLists = issue.getLists(),
@@ -125,7 +125,9 @@
},
findList (key, val, type = 'label') {
return this.state.lists.filter((list) => {
- return list[key] === val && list['type'] === type;
+ const byType = type ? list['type'] === type : true;
+
+ return list[key] === val && byType;
})[0];
},
updateFiltersUrl () {