summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-11-24 10:38:24 +0000
committerPhil Hughes <me@iamphill.com>2016-11-24 10:38:24 +0000
commit18a54116e2f1d2ac88d03ad7ed48213dab580854 (patch)
treea009817678691421f28fbf650e917a21367c7554
parent058c652904b13cea73e92615776f29fd1a8a1ded (diff)
downloadgitlab-ce-boards-issue-sorting.tar.gz
Fixed dragging issue moving wrong issue after multiple drags of issueboards-issue-sorting
-rw-r--r--app/assets/javascripts/boards/components/board_list.js.es62
-rw-r--r--app/views/projects/boards/components/_card.html.haml1
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/boards/components/board_list.js.es6 b/app/assets/javascripts/boards/components/board_list.js.es6
index 8996ca438a6..48e37fa64ea 100644
--- a/app/assets/javascripts/boards/components/board_list.js.es6
+++ b/app/assets/javascripts/boards/components/board_list.js.es6
@@ -88,8 +88,8 @@
const card = this.$refs.issue[e.oldIndex];
card.showDetail = false;
- Store.moving.issue = card.issue;
Store.moving.list = card.list;
+ Store.moving.issue = Store.moving.list.findIssue(+e.item.dataset.issueId);
gl.issueBoards.onStart();
},
diff --git a/app/views/projects/boards/components/_card.html.haml b/app/views/projects/boards/components/_card.html.haml
index 34effac17b2..1f31496e73f 100644
--- a/app/views/projects/boards/components/_card.html.haml
+++ b/app/views/projects/boards/components/_card.html.haml
@@ -1,5 +1,6 @@
%li.card{ ":class" => '{ "user-can-drag": !disabled && issue.id, "is-disabled": disabled || !issue.id, "is-active": issueDetailVisible }',
":index" => "index",
+ ":data-issue-id" => "issue.id",
"@mousedown" => "mouseDown",
"@mousemove" => "mouseMove",
"@mouseup" => "showIssue($event)" }