diff options
Diffstat (limited to 'client')
4 files changed, 3 insertions, 4 deletions
diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.html b/client/src/app/+admin/follows/followers-list/followers-list.component.html index 9499a0433..d5b1b789d 100644 --- a/client/src/app/+admin/follows/followers-list/followers-list.component.html +++ b/client/src/app/+admin/follows/followers-list/followers-list.component.html | |||
@@ -3,8 +3,8 @@ | |||
3 | sortField="createdAt" (onLazyLoad)="loadLazy($event)" | 3 | sortField="createdAt" (onLazyLoad)="loadLazy($event)" |
4 | > | 4 | > |
5 | <p-column field="id" header="ID" [style]="{ width: '60px' }"></p-column> | 5 | <p-column field="id" header="ID" [style]="{ width: '60px' }"></p-column> |
6 | <p-column field="score" header="Score"></p-column> | ||
6 | <p-column field="follower.host" header="Host"></p-column> | 7 | <p-column field="follower.host" header="Host"></p-column> |
7 | <p-column field="follower.score" header="Score"></p-column> | ||
8 | <p-column field="state" header="State"></p-column> | 8 | <p-column field="state" header="State"></p-column> |
9 | <p-column field="createdAt" header="Created date" [sortable]="true"></p-column> | 9 | <p-column field="createdAt" header="Created date" [sortable]="true"></p-column> |
10 | </p-dataTable> | 10 | </p-dataTable> |
diff --git a/client/src/app/shared/misc/utils.ts b/client/src/app/shared/misc/utils.ts index 2739ff81a..23b46812b 100644 --- a/client/src/app/shared/misc/utils.ts +++ b/client/src/app/shared/misc/utils.ts | |||
@@ -31,7 +31,7 @@ function populateAsyncUserVideoChannels (authService: AuthService, channel: any[ | |||
31 | const videoChannels = user.videoChannels | 31 | const videoChannels = user.videoChannels |
32 | if (Array.isArray(videoChannels) === false) return | 32 | if (Array.isArray(videoChannels) === false) return |
33 | 33 | ||
34 | videoChannels.forEach(c => channel.push({ id: c.id, label: c.name })) | 34 | videoChannels.forEach(c => channel.push({ id: c.id, label: c.displayName })) |
35 | 35 | ||
36 | return res() | 36 | return res() |
37 | } | 37 | } |
diff --git a/client/src/app/videos/+video-edit/video-add.component.html b/client/src/app/videos/+video-edit/video-add.component.html index 2040ff9d4..34291c6c6 100644 --- a/client/src/app/videos/+video-edit/video-add.component.html +++ b/client/src/app/videos/+video-edit/video-add.component.html | |||
@@ -44,7 +44,6 @@ | |||
44 | [validationMessages]="validationMessages" [videoPrivacies]="videoPrivacies" [userVideoChannels]="userVideoChannels" | 44 | [validationMessages]="validationMessages" [videoPrivacies]="videoPrivacies" [userVideoChannels]="userVideoChannels" |
45 | ></my-video-edit> | 45 | ></my-video-edit> |
46 | 46 | ||
47 | |||
48 | <div class="submit-container"> | 47 | <div class="submit-container"> |
49 | <div *ngIf="videoUploaded === false" class="message-submit">Publish will be available when upload is finished</div> | 48 | <div *ngIf="videoUploaded === false" class="message-submit">Publish will be available when upload is finished</div> |
50 | 49 | ||
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html index a5c387638..5921b4b72 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.html +++ b/client/src/app/videos/+video-watch/video-watch.component.html | |||
@@ -85,7 +85,7 @@ | |||
85 | </div> | 85 | </div> |
86 | 86 | ||
87 | <div class="video-info-channel"> | 87 | <div class="video-info-channel"> |
88 | {{ video.channel.name }} | 88 | {{ video.channel.displayName }} |
89 | <!-- Here will be the subscribe button --> | 89 | <!-- Here will be the subscribe button --> |
90 | </div> | 90 | </div> |
91 | 91 | ||