aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-01-10 10:30:08 +0100
committerChocobozzz <me@florianbigard.com>2020-01-10 10:30:39 +0100
commit62fca05de45848f3241c1b078df51d79692ebfee (patch)
treea096364c5d64fc7377bfc82182623258aa7ba9ba
parentdce659fa7cb2b0f814e454a7a5c6860f9c37b39e (diff)
downloadPeerTube-62fca05de45848f3241c1b078df51d79692ebfee.tar.gz
PeerTube-62fca05de45848f3241c1b078df51d79692ebfee.tar.zst
PeerTube-62fca05de45848f3241c1b078df51d79692ebfee.zip
Fix default avatar URL
-rw-r--r--client/src/app/shared/actor/actor.model.ts2
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.html3
-rw-r--r--shared/extra-utils/cli/cli.ts2
3 files changed, 4 insertions, 3 deletions
diff --git a/client/src/app/shared/actor/actor.model.ts b/client/src/app/shared/actor/actor.model.ts
index 9cc51b948..0e5060f67 100644
--- a/client/src/app/shared/actor/actor.model.ts
+++ b/client/src/app/shared/actor/actor.model.ts
@@ -20,7 +20,7 @@ export abstract class Actor implements ActorServer {
20 20
21 if (actor && actor.avatar) return absoluteAPIUrl + actor.avatar.path 21 if (actor && actor.avatar) return absoluteAPIUrl + actor.avatar.path
22 22
23 this.GET_DEFAULT_AVATAR_URL() 23 return this.GET_DEFAULT_AVATAR_URL()
24 } 24 }
25 25
26 static GET_DEFAULT_AVATAR_URL () { 26 static GET_DEFAULT_AVATAR_URL () {
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 9f1b51b2d..bc3a3ffdd 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -145,6 +145,7 @@
145 <div class="pt-3 border-top video-info-channel d-flex"> 145 <div class="pt-3 border-top video-info-channel d-flex">
146 <div class="video-info-channel-left d-flex"> 146 <div class="video-info-channel-left d-flex">
147 <avatar-channel [video]="video"></avatar-channel> 147 <avatar-channel [video]="video"></avatar-channel>
148
148 <div class="video-info-channel-left-links ml-1"> 149 <div class="video-info-channel-left-links ml-1">
149 <a [routerLink]="[ '/video-channels', video.byVideoChannel ]" i18n-title title="Go the channel page"> 150 <a [routerLink]="[ '/video-channels', video.byVideoChannel ]" i18n-title title="Go the channel page">
150 {{ video.channel.displayName }} 151 {{ video.channel.displayName }}
@@ -230,7 +231,7 @@
230 <div class="video-attribute"> 231 <div class="video-attribute">
231 <span i18n class="video-attribute-label">Duration</span> 232 <span i18n class="video-attribute-label">Duration</span>
232 <span class="video-attribute-value">{{ video.duration | myVideoDurationFormatter }}</span> 233 <span class="video-attribute-value">{{ video.duration | myVideoDurationFormatter }}</span>
233 </div> 234 </div>
234 </div> 235 </div>
235 236
236 <my-video-comments 237 <my-video-comments
diff --git a/shared/extra-utils/cli/cli.ts b/shared/extra-utils/cli/cli.ts
index d532b62b0..54d05e9c6 100644
--- a/shared/extra-utils/cli/cli.ts
+++ b/shared/extra-utils/cli/cli.ts
@@ -6,7 +6,7 @@ function getEnvCli (server?: ServerInfo) {
6 return `NODE_ENV=test NODE_APP_INSTANCE=${server.serverNumber}` 6 return `NODE_ENV=test NODE_APP_INSTANCE=${server.serverNumber}`
7} 7}
8 8
9async function execCLI (command: string,) { 9async function execCLI (command: string) {
10 return new Promise<string>((res, rej) => { 10 return new Promise<string>((res, rej) => {
11 exec(command, (err, stdout, stderr) => { 11 exec(command, (err, stdout, stderr) => {
12 if (err) return rej(err) 12 if (err) return rej(err)