OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix lint

pull/2870/head
Chocobozzz 2020-06-12 08:12:13 +02:00
parent adcf921271
commit 8b381422b8
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts
View File

@ -1,4 +1,4 @@
import { Component, OnInit } from '@angular/core' import { Component, OnInit, AfterViewInit } from '@angular/core'
import { SortMeta } from 'primeng/api' import { SortMeta } from 'primeng/api'
import { Notifier, ServerService } from '@app/core' import { Notifier, ServerService } from '@app/core'
import { ConfirmService } from '../../../core' import { ConfirmService } from '../../../core'
@ -17,7 +17,7 @@ import { VideoService } from '@app/shared/video/video.service'
templateUrl: './video-block-list.component.html', templateUrl: './video-block-list.component.html',
styleUrls: [ '../moderation.component.scss', './video-block-list.component.scss' ] styleUrls: [ '../moderation.component.scss', './video-block-list.component.scss' ]
}) })
export class VideoBlockListComponent extends RestTable implements OnInit { export class VideoBlockListComponent extends RestTable implements OnInit, AfterViewInit {
blocklist: (VideoBlacklist & { reasonHtml?: string })[] = [] blocklist: (VideoBlacklist & { reasonHtml?: string })[] = []
totalRecords = 0 totalRecords = 0
sort: SortMeta = { field: 'createdAt', order: -1 } sort: SortMeta = { field: 'createdAt', order: -1 }
@ -64,7 +64,7 @@ export class VideoBlockListComponent extends RestTable implements OnInit {
[ [
{ {
label: this.i18n('Actions for the video'), label: this.i18n('Actions for the video'),
isHeader: true, isHeader: true
}, },
{ {
label: this.i18n('Unblock video'), label: this.i18n('Unblock video'),
@ -177,7 +177,7 @@ export class VideoBlockListComponent extends RestTable implements OnInit {
this.videoBlocklistService.listBlocks({ this.videoBlocklistService.listBlocks({
pagination: this.pagination, pagination: this.pagination,
sort: this.sort, sort: this.sort,
search: this.search, search: this.search
}) })
.subscribe( .subscribe(
async resultList => { async resultList => {

2
server/tests/api/server/follows.ts
View File

@ -326,7 +326,7 @@ describe('Test follows', function () {
let video4: Video let video4: Video
before(async function () { before(async function () {
this.timeout(20000) this.timeout(50000)
const video4Attributes = { const video4Attributes = {
name: 'server3-4', name: 'server3-4',