diff options
Diffstat (limited to 'app/assets/javascripts/boards/models')
-rw-r--r-- | app/assets/javascripts/boards/models/issue.js | 4 | ||||
-rw-r--r-- | app/assets/javascripts/boards/models/list.js | 5 | ||||
-rw-r--r-- | app/assets/javascripts/boards/models/user.js | 7 |
3 files changed, 7 insertions, 9 deletions
diff --git a/app/assets/javascripts/boards/models/issue.js b/app/assets/javascripts/boards/models/issue.js index d6175069e37..db783467f87 100644 --- a/app/assets/javascripts/boards/models/issue.js +++ b/app/assets/javascripts/boards/models/issue.js @@ -6,7 +6,7 @@ import Vue from 'vue'; class ListIssue { - constructor (obj) { + constructor (obj, defaultAvatar) { this.globalId = obj.id; this.id = obj.iid; this.title = obj.title; @@ -19,7 +19,7 @@ class ListIssue { this.position = obj.relative_position || Infinity; if (obj.assignee) { - this.assignee = new ListUser(obj.assignee); + this.assignee = new ListUser(obj.assignee, defaultAvatar); } if (obj.milestone) { diff --git a/app/assets/javascripts/boards/models/list.js b/app/assets/javascripts/boards/models/list.js index f2b79a88a4a..bd2f62bcc1a 100644 --- a/app/assets/javascripts/boards/models/list.js +++ b/app/assets/javascripts/boards/models/list.js @@ -6,7 +6,7 @@ import queryData from '../utils/query_data'; const PER_PAGE = 20; class List { - constructor (obj) { + constructor (obj, defaultAvatar) { this.id = obj.id; this._uid = this.guid(); this.position = obj.position; @@ -18,6 +18,7 @@ class List { this.loadingMore = false; this.issues = []; this.issuesSize = 0; + this.defaultAvatar = defaultAvatar; if (obj.label) { this.label = new ListLabel(obj.label); @@ -106,7 +107,7 @@ class List { createIssues (data) { data.forEach((issueObj) => { - this.addIssue(new ListIssue(issueObj)); + this.addIssue(new ListIssue(issueObj, this.defaultAvatar)); }); } diff --git a/app/assets/javascripts/boards/models/user.js b/app/assets/javascripts/boards/models/user.js index 875c21a37d3..2af583c3279 100644 --- a/app/assets/javascripts/boards/models/user.js +++ b/app/assets/javascripts/boards/models/user.js @@ -1,12 +1,9 @@ -/* eslint-disable no-unused-vars */ -import defaultAvatar from '../utils/default_avatar'; - class ListUser { - constructor(user) { + constructor(user, defaultAvatar) { this.id = user.id; this.name = user.name; this.username = user.username; - this.avatar = user.avatar_url || defaultAvatar(); + this.avatar = user.avatar_url || defaultAvatar; } } |