diff options
author | Phil Hughes <me@iamphill.com> | 2016-08-04 17:47:45 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-08-17 17:12:47 +0100 |
commit | 83b4ba282344f1a9c1e274ca2ba381daf87f88e5 (patch) | |
tree | bea960674a479d4e12a4f308dfc14ab0d5fc80f4 /app/assets/javascripts/boards/models | |
parent | a3e52ef9175d153649b7b8cfe25daf707ba2e2ed (diff) | |
download | gitlab-ce-83b4ba282344f1a9c1e274ca2ba381daf87f88e5.tar.gz |
Can move between lists
Currently a bug exists were moving into done does not remove from all
Diffstat (limited to 'app/assets/javascripts/boards/models')
-rw-r--r-- | app/assets/javascripts/boards/models/issue.js.es6 | 2 | ||||
-rw-r--r-- | app/assets/javascripts/boards/models/list.js.es6 | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/boards/models/issue.js.es6 b/app/assets/javascripts/boards/models/issue.js.es6 index a8fed848445..1b32cf80b9b 100644 --- a/app/assets/javascripts/boards/models/issue.js.es6 +++ b/app/assets/javascripts/boards/models/issue.js.es6 @@ -1,6 +1,6 @@ class Issue { constructor (obj) { - this.id = obj.id; + this.id = obj.iid; this.title = obj.title; this.labels = []; diff --git a/app/assets/javascripts/boards/models/list.js.es6 b/app/assets/javascripts/boards/models/list.js.es6 index c0bc2060c7b..a9322eb216b 100644 --- a/app/assets/javascripts/boards/models/list.js.es6 +++ b/app/assets/javascripts/boards/models/list.js.es6 @@ -11,9 +11,11 @@ class List { } if (this.type !== 'blank') { + this.loading = true; service.getIssuesForList(this.id) .then((resp) => { const data = resp.json(); + this.loading = false; data.forEach((issue) => { this.issues.push(new Issue(issue)); |