diff options
| author | Phil Hughes <me@iamphill.com> | 2016-08-08 08:54:58 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-08-17 17:12:47 +0100 |
| commit | 6c3caa00f84cf446344d6f896d3283bc2e8e7fb6 (patch) | |
| tree | f9c649c19dde215d87b8a53c1bf1f8a282cb9b31 | |
| parent | 11497095377a1d97024426ac2de846c6bb995a7b (diff) | |
| download | gitlab-ce-6c3caa00f84cf446344d6f896d3283bc2e8e7fb6.tar.gz | |
Fixed error when trying to drag list several times
| -rw-r--r-- | app/assets/javascripts/boards/components/board_list.js.es6 | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/boards/stores/boards_store.js.es6 | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/boards/components/board_list.js.es6 b/app/assets/javascripts/boards/components/board_list.js.es6 index 79504999068..df64d57b5c3 100644 --- a/app/assets/javascripts/boards/components/board_list.js.es6 +++ b/app/assets/javascripts/boards/components/board_list.js.es6 @@ -36,7 +36,6 @@ }, ready: function () { const options = _.extend({ - // sort: false, group: 'issues', disabled: this.disabled, onAdd: function (e) { diff --git a/app/assets/javascripts/boards/stores/boards_store.js.es6 b/app/assets/javascripts/boards/stores/boards_store.js.es6 index abc64aef3d5..22c84de66a9 100644 --- a/app/assets/javascripts/boards/stores/boards_store.js.es6 +++ b/app/assets/javascripts/boards/stores/boards_store.js.es6 @@ -79,7 +79,9 @@ listTo = this.findList('position', newIndex); listFrom.position = newIndex; - if (newIndex > listTo.position) { + if (newIndex === listTo.position) { + listTo.position = oldIndex; + } else if (newIndex > listTo.position) { listTo.position--; } else { listTo.position++; @@ -97,8 +99,6 @@ return issue.label; }); - listFrom.removeIssue(issue); - // Add to new lists issues if it doesn't already exist if (!issueTo) { listTo.addIssue(issue, listFrom); @@ -109,6 +109,8 @@ list.removeIssue(issue); }); issue.removeLabels(listLabels); + } else { + listFrom.removeIssue(issue); } }, findList: function (key, val) { |