From 60650c77c8a2a98e92d869b237ae4900f369a8fc Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 11 Jan 2018 09:35:50 +0100
Subject: Add scores to follows and remove bad ones

---
 .../src/app/+admin/follows/followers-list/followers-list.component.html | 2 +-
 client/src/app/shared/misc/utils.ts                                     | 2 +-
 client/src/app/videos/+video-edit/video-add.component.html              | 1 -
 client/src/app/videos/+video-watch/video-watch.component.html           | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'client')

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 @@
     sortField="createdAt" (onLazyLoad)="loadLazy($event)"
 >
   <p-column field="id" header="ID" [style]="{ width: '60px' }"></p-column>
+  <p-column field="score" header="Score"></p-column>
   <p-column field="follower.host" header="Host"></p-column>
-  <p-column field="follower.score" header="Score"></p-column>
   <p-column field="state" header="State"></p-column>
   <p-column field="createdAt" header="Created date" [sortable]="true"></p-column>
 </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[
           const videoChannels = user.videoChannels
           if (Array.isArray(videoChannels) === false) return
 
-          videoChannels.forEach(c => channel.push({ id: c.id, label: c.name }))
+          videoChannels.forEach(c => channel.push({ id: c.id, label: c.displayName }))
 
           return res()
         }
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 @@
       [validationMessages]="validationMessages" [videoPrivacies]="videoPrivacies" [userVideoChannels]="userVideoChannels"
     ></my-video-edit>
 
-
     <div class="submit-container">
       <div *ngIf="videoUploaded === false" class="message-submit">Publish will be available when upload is finished</div>
 
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 @@
       </div>
 
       <div class="video-info-channel">
-        {{ video.channel.name }}
+        {{ video.channel.displayName }}
         <!-- Here will be the subscribe button -->
       </div>
 
-- 
cgit v1.2.3