aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts10
-rw-r--r--server/tests/api/server/follows.ts2
2 files changed, 6 insertions, 6 deletions
diff --git a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts
index 7b3691332..c0ac32242 100644
--- a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts
+++ b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts
@@ -1,4 +1,4 @@
1import { Component, OnInit } from '@angular/core' 1import { Component, OnInit, AfterViewInit } from '@angular/core'
2import { SortMeta } from 'primeng/api' 2import { SortMeta } from 'primeng/api'
3import { Notifier, ServerService } from '@app/core' 3import { Notifier, ServerService } from '@app/core'
4import { ConfirmService } from '../../../core' 4import { ConfirmService } from '../../../core'
@@ -17,7 +17,7 @@ import { VideoService } from '@app/shared/video/video.service'
17 templateUrl: './video-block-list.component.html', 17 templateUrl: './video-block-list.component.html',
18 styleUrls: [ '../moderation.component.scss', './video-block-list.component.scss' ] 18 styleUrls: [ '../moderation.component.scss', './video-block-list.component.scss' ]
19}) 19})
20export class VideoBlockListComponent extends RestTable implements OnInit { 20export class VideoBlockListComponent extends RestTable implements OnInit, AfterViewInit {
21 blocklist: (VideoBlacklist & { reasonHtml?: string })[] = [] 21 blocklist: (VideoBlacklist & { reasonHtml?: string })[] = []
22 totalRecords = 0 22 totalRecords = 0
23 sort: SortMeta = { field: 'createdAt', order: -1 } 23 sort: SortMeta = { field: 'createdAt', order: -1 }
@@ -55,7 +55,7 @@ export class VideoBlockListComponent extends RestTable implements OnInit {
55 this.notifier.success(this.i18n('Video {{name}} switched to manual block.', { name: videoBlock.video.name })) 55 this.notifier.success(this.i18n('Video {{name}} switched to manual block.', { name: videoBlock.video.name }))
56 this.loadData() 56 this.loadData()
57 }, 57 },
58 58
59 err => this.notifier.error(err.message) 59 err => this.notifier.error(err.message)
60 ) 60 )
61 } 61 }
@@ -64,7 +64,7 @@ export class VideoBlockListComponent extends RestTable implements OnInit {
64 [ 64 [
65 { 65 {
66 label: this.i18n('Actions for the video'), 66 label: this.i18n('Actions for the video'),
67 isHeader: true, 67 isHeader: true
68 }, 68 },
69 { 69 {
70 label: this.i18n('Unblock video'), 70 label: this.i18n('Unblock video'),
@@ -177,7 +177,7 @@ export class VideoBlockListComponent extends RestTable implements OnInit {
177 this.videoBlocklistService.listBlocks({ 177 this.videoBlocklistService.listBlocks({
178 pagination: this.pagination, 178 pagination: this.pagination,
179 sort: this.sort, 179 sort: this.sort,
180 search: this.search, 180 search: this.search
181 }) 181 })
182 .subscribe( 182 .subscribe(
183 async resultList => { 183 async resultList => {
diff --git a/server/tests/api/server/follows.ts b/server/tests/api/server/follows.ts
index b686af4e4..1ae1adb2d 100644
--- a/server/tests/api/server/follows.ts
+++ b/server/tests/api/server/follows.ts
@@ -326,7 +326,7 @@ describe('Test follows', function () {
326 let video4: Video 326 let video4: Video
327 327
328 before(async function () { 328 before(async function () {
329 this.timeout(20000) 329 this.timeout(50000)
330 330
331 const video4Attributes = { 331 const video4Attributes = {
332 name: 'server3-4', 332 name: 'server3-4',