diff options
author | Phil Hughes <me@iamphill.com> | 2017-02-27 15:36:43 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-02-27 15:36:43 +0300 |
commit | c401088bc7a1e560023b7eb6ebfffb65d51c641c (patch) | |
tree | daedae43c2332fbd175641f482609d6ed70c97a1 /app/assets/javascripts/boards | |
parent | 16808a2750724b380920423808166aab5ef5dfd9 (diff) |
Fixed JS conflicts
Diffstat (limited to 'app/assets/javascripts/boards')
-rw-r--r-- | app/assets/javascripts/boards/models/list.js.es6 | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/app/assets/javascripts/boards/models/list.js.es6 b/app/assets/javascripts/boards/models/list.js.es6 index fa67d8ab27b..f237567208c 100644 --- a/app/assets/javascripts/boards/models/list.js.es6 +++ b/app/assets/javascripts/boards/models/list.js.es6 @@ -134,31 +134,24 @@ class List { if (listFrom) { this.issuesSize += 1; -<<<<<<< HEAD - gl.boardService.moveIssue(issue.id, listFrom.id, this.id, moveBeforeIid, moveAfterIid) - .then(() => { - listFrom.getIssues(false); - }); -======= - this.updateIssueLabel(issue, listFrom); ->>>>>>> 82f6c0f5ac4ed29390ed90592d2c431f3494d93f + + this.updateIssueLabel(issue, listFrom, moveBeforeIid, moveAfterIid); } } } -<<<<<<< HEAD moveIssue (issue, oldIndex, newIndex, moveBeforeIid, moveAfterIid) { this.issues.splice(oldIndex, 1); this.issues.splice(newIndex, 0, issue); gl.boardService.moveIssue(issue.id, null, null, moveBeforeIid, moveAfterIid); -======= - updateIssueLabel(issue, listFrom) { - gl.boardService.moveIssue(issue.id, listFrom.id, this.id) + } + + updateIssueLabel(issue, listFrom, moveBeforeIid, moveAfterIid) { + gl.boardService.moveIssue(issue.id, listFrom.id, this.id, moveBeforeIid, moveAfterIid) .then(() => { listFrom.getIssues(false); }); ->>>>>>> 82f6c0f5ac4ed29390ed90592d2c431f3494d93f } findIssue (id) { |