aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRigel Kent <sendmemail@rigelk.eu>2020-03-05 23:49:12 +0100
committerRigel Kent <sendmemail@rigelk.eu>2020-03-05 23:49:12 +0100
commit288c78eaae7c593f4d8f668302b13b138f6975c3 (patch)
tree52d2f4daf1e11c83d4bdb8daba010f66289ca410
parent5ed19b4b8b24daf8a651596a745d856006aecb98 (diff)
downloadPeerTube-288c78eaae7c593f4d8f668302b13b138f6975c3.tar.gz
PeerTube-288c78eaae7c593f4d8f668302b13b138f6975c3.tar.zst
PeerTube-288c78eaae7c593f4d8f668302b13b138f6975c3.zip
Always copy full actor handle in video-channels view
-rw-r--r--client/src/app/+accounts/accounts.component.ts4
-rw-r--r--client/src/app/+video-channels/video-channels.component.html2
-rw-r--r--client/src/app/shared/video-channel/video-channel.model.ts2
3 files changed, 5 insertions, 3 deletions
diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts
index 061eb953a..2ca6062c2 100644
--- a/client/src/app/+accounts/accounts.component.ts
+++ b/client/src/app/+accounts/accounts.component.ts
@@ -3,8 +3,8 @@ import { ActivatedRoute } from '@angular/router'
3import { AccountService } from '@app/shared/account/account.service' 3import { AccountService } from '@app/shared/account/account.service'
4import { Account } from '@app/shared/account/account.model' 4import { Account } from '@app/shared/account/account.model'
5import { RestExtractor, UserService } from '@app/shared' 5import { RestExtractor, UserService } from '@app/shared'
6import { catchError, distinctUntilChanged, first, map, switchMap, tap } from 'rxjs/operators' 6import { catchError, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators'
7import { forkJoin, Subscription } from 'rxjs' 7import { Subscription } from 'rxjs'
8import { AuthService, Notifier, RedirectService } from '@app/core' 8import { AuthService, Notifier, RedirectService } from '@app/core'
9import { User, UserRight } from '../../../../shared' 9import { User, UserRight } from '../../../../shared'
10import { I18n } from '@ngx-translate/i18n-polyfill' 10import { I18n } from '@ngx-translate/i18n-polyfill'
diff --git a/client/src/app/+video-channels/video-channels.component.html b/client/src/app/+video-channels/video-channels.component.html
index 1087de113..6192b8ae5 100644
--- a/client/src/app/+video-channels/video-channels.component.html
+++ b/client/src/app/+video-channels/video-channels.component.html
@@ -9,7 +9,7 @@
9 <div class="actor-display-name">{{ videoChannel.displayName }}</div> 9 <div class="actor-display-name">{{ videoChannel.displayName }}</div>
10 <div class="actor-name"> 10 <div class="actor-name">
11 <span>{{ videoChannel.nameWithHost }}</span> 11 <span>{{ videoChannel.nameWithHost }}</span>
12 <button [cdkCopyToClipboard]="videoChannel.nameWithHost" (click)="activateCopiedMessage()" 12 <button [cdkCopyToClipboard]="videoChannel.nameWithHostForced" (click)="activateCopiedMessage()"
13 class="btn btn-outline-secondary btn-sm copy-button" 13 class="btn btn-outline-secondary btn-sm copy-button"
14 > 14 >
15 <span class="glyphicon glyphicon-copy"></span> 15 <span class="glyphicon glyphicon-copy"></span>
diff --git a/client/src/app/shared/video-channel/video-channel.model.ts b/client/src/app/shared/video-channel/video-channel.model.ts
index 309b614ae..fec050cde 100644
--- a/client/src/app/shared/video-channel/video-channel.model.ts
+++ b/client/src/app/shared/video-channel/video-channel.model.ts
@@ -8,6 +8,7 @@ export class VideoChannel extends Actor implements ServerVideoChannel {
8 support: string 8 support: string
9 isLocal: boolean 9 isLocal: boolean
10 nameWithHost: string 10 nameWithHost: string
11 nameWithHostForced: string
11 ownerAccount?: Account 12 ownerAccount?: Account
12 ownerBy?: string 13 ownerBy?: string
13 ownerAvatarUrl?: string 14 ownerAvatarUrl?: string
@@ -20,6 +21,7 @@ export class VideoChannel extends Actor implements ServerVideoChannel {
20 this.support = hash.support 21 this.support = hash.support
21 this.isLocal = hash.isLocal 22 this.isLocal = hash.isLocal
22 this.nameWithHost = Actor.CREATE_BY_STRING(this.name, this.host) 23 this.nameWithHost = Actor.CREATE_BY_STRING(this.name, this.host)
24 this.nameWithHostForced = Actor.CREATE_BY_STRING(this.name, this.host, true)
23 25
24 if (hash.ownerAccount) { 26 if (hash.ownerAccount) {
25 this.ownerAccount = hash.ownerAccount 27 this.ownerAccount = hash.ownerAccount