diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-04-19 20:42:33 +0200 |
---|---|---|
committer | Rigel Kent <par@rigelk.eu> | 2020-05-01 16:41:02 +0200 |
commit | 042daa7072c0168b876db2badfc838dba7ac2284 (patch) | |
tree | d4723777bc9934aa3409a2c3b2728b1b4b3b7898 | |
parent | d384061366ae06294c0e222f0fb7ec4f0a172f39 (diff) | |
download | PeerTube-042daa7072c0168b876db2badfc838dba7ac2284.tar.gz PeerTube-042daa7072c0168b876db2badfc838dba7ac2284.tar.zst PeerTube-042daa7072c0168b876db2badfc838dba7ac2284.zip |
Fixing circular dependency and table variable access
-rw-r--r-- | client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts | 4 | ||||
-rw-r--r-- | client/src/app/shared/rest/rest-table.ts | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts index e4e78cdf7..0c727ae90 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts | |||
@@ -223,7 +223,7 @@ export class VideoAbuseListComponent extends RestTable implements OnInit { | |||
223 | } | 223 | } |
224 | 224 | ||
225 | getVideoEmbed (videoAbuse: VideoAbuse) { | 225 | getVideoEmbed (videoAbuse: VideoAbuse) { |
226 | const absoluteAPIUrl = 'http://localhost:9000' || getAbsoluteAPIUrl() // TODO | 226 | const absoluteAPIUrl = getAbsoluteAPIUrl() |
227 | const embedUrl = buildVideoLink({ | 227 | const embedUrl = buildVideoLink({ |
228 | baseUrl: absoluteAPIUrl + '/videos/embed/' + videoAbuse.video.uuid, | 228 | baseUrl: absoluteAPIUrl + '/videos/embed/' + videoAbuse.video.uuid, |
229 | warningTitle: false | 229 | warningTitle: false |
@@ -262,7 +262,7 @@ export class VideoAbuseListComponent extends RestTable implements OnInit { | |||
262 | protected loadData () { | 262 | protected loadData () { |
263 | return this.videoAbuseService.getVideoAbuses({ | 263 | return this.videoAbuseService.getVideoAbuses({ |
264 | pagination: this.pagination, | 264 | pagination: this.pagination, |
265 | sort: this.sort, | 265 | sort: this.sort, |
266 | search: this.search | 266 | search: this.search |
267 | }).subscribe( | 267 | }).subscribe( |
268 | async resultList => { | 268 | async resultList => { |
diff --git a/client/src/app/shared/rest/rest-table.ts b/client/src/app/shared/rest/rest-table.ts index 63e0e1b97..5954a7ba1 100644 --- a/client/src/app/shared/rest/rest-table.ts +++ b/client/src/app/shared/rest/rest-table.ts | |||
@@ -11,7 +11,7 @@ export abstract class RestTable { | |||
11 | abstract sort: SortMeta | 11 | abstract sort: SortMeta |
12 | abstract pagination: RestPagination | 12 | abstract pagination: RestPagination |
13 | 13 | ||
14 | protected search: string | 14 | search: string |
15 | private searchStream: Subject<string> | 15 | private searchStream: Subject<string> |
16 | 16 | ||
17 | abstract getIdentifier (): string | 17 | abstract getIdentifier (): string |