diff options
| author | Chocobozzz <florian.bigard@gmail.com> | 2017-12-11 11:06:32 +0100 |
|---|---|---|
| committer | Chocobozzz <florian.bigard@gmail.com> | 2017-12-11 11:06:32 +0100 |
| commit | fada8d75550dc7365f7e18ee1569b9406251d660 (patch) | |
| tree | db9dc01c18693824f83fce5020f4c1f3ae7c0865 /server/models/account/user.ts | |
| parent | 492fd28167f770d79a430fc57451b5a9e075d8e7 (diff) | |
| parent | c2830fa8f84f61462098bf36add824f89436dfa9 (diff) | |
| download | PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.tar.gz PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.tar.zst PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.zip | |
Merge branch 'feature/design' into develop
Diffstat (limited to 'server/models/account/user.ts')
| -rw-r--r-- | server/models/account/user.ts | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/server/models/account/user.ts b/server/models/account/user.ts index 8f7c9b013..3705947c0 100644 --- a/server/models/account/user.ts +++ b/server/models/account/user.ts | |||
| @@ -157,10 +157,7 @@ toFormattedJSON = function (this: UserInstance) { | |||
| 157 | roleLabel: USER_ROLE_LABELS[this.role], | 157 | roleLabel: USER_ROLE_LABELS[this.role], |
| 158 | videoQuota: this.videoQuota, | 158 | videoQuota: this.videoQuota, |
| 159 | createdAt: this.createdAt, | 159 | createdAt: this.createdAt, |
| 160 | account: { | 160 | account: this.Account.toFormattedJSON() |
| 161 | id: this.Account.id, | ||
| 162 | uuid: this.Account.uuid | ||
| 163 | } | ||
| 164 | } | 161 | } |
| 165 | 162 | ||
| 166 | if (Array.isArray(this.Account.VideoChannels) === true) { | 163 | if (Array.isArray(this.Account.VideoChannels) === true) { |