From: Rigel Kent Date: Sun, 19 Apr 2020 18:42:33 +0000 (+0200) Subject: Fixing circular dependency and table variable access X-Git-Tag: v2.2.0-rc.1~136 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=042daa7072c0168b876db2badfc838dba7ac2284;p=oweals%2Fpeertube.git Fixing circular dependency and table variable access --- 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 { } getVideoEmbed (videoAbuse: VideoAbuse) { - const absoluteAPIUrl = 'http://localhost:9000' || getAbsoluteAPIUrl() // TODO + const absoluteAPIUrl = getAbsoluteAPIUrl() const embedUrl = buildVideoLink({ baseUrl: absoluteAPIUrl + '/videos/embed/' + videoAbuse.video.uuid, warningTitle: false @@ -262,7 +262,7 @@ export class VideoAbuseListComponent extends RestTable implements OnInit { protected loadData () { return this.videoAbuseService.getVideoAbuses({ pagination: this.pagination, - sort: this.sort, + sort: this.sort, search: this.search }).subscribe( 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 { abstract sort: SortMeta abstract pagination: RestPagination - protected search: string + search: string private searchStream: Subject abstract getIdentifier (): string