pull/1987/head
Chocobozzz 2019-07-16 17:38:20 +02:00 committed by Chocobozzz
parent f0c5e8b657
commit 109d893ff5
4 changed files with 13 additions and 5 deletions

View File

@ -14,7 +14,7 @@ import { BuildFormArgument, FormReactive, FormValidatorService } from '@app/shar
templateUrl: './plugin-show-installed.component.html',
styleUrls: [ './plugin-show-installed.component.scss' ]
})
export class PluginShowInstalledComponent extends FormReactive implements OnInit, OnDestroy{
export class PluginShowInstalledComponent extends FormReactive implements OnInit, OnDestroy {
plugin: PeerTubePlugin
registeredSettings: RegisterSettingOptions[] = []
pluginTypeLabel: string

View File

@ -25,10 +25,16 @@ import { MyAccountServerBlocklistComponent } from '@app/+my-account/my-account-b
import { MyAccountHistoryComponent } from '@app/+my-account/my-account-history/my-account-history.component'
import { MyAccountNotificationsComponent } from '@app/+my-account/my-account-notifications/my-account-notifications.component'
import { MyAccountNotificationPreferencesComponent } from '@app/+my-account/my-account-settings/my-account-notification-preferences'
import { MyAccountVideoPlaylistCreateComponent } from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-create.component'
import { MyAccountVideoPlaylistUpdateComponent } from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-update.component'
import {
MyAccountVideoPlaylistCreateComponent
} from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-create.component'
import {
MyAccountVideoPlaylistUpdateComponent
} from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-update.component'
import { MyAccountVideoPlaylistsComponent } from '@app/+my-account/my-account-video-playlists/my-account-video-playlists.component'
import { MyAccountVideoPlaylistElementsComponent } from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-elements.component'
import {
MyAccountVideoPlaylistElementsComponent
} from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-elements.component'
import { DragDropModule } from '@angular/cdk/drag-drop'
import { MyAccountChangeEmailComponent } from '@app/+my-account/my-account-settings/my-account-change-email'
import { MultiSelectModule } from 'primeng/primeng'

View File

@ -154,7 +154,7 @@ export class PluginModel extends Model<PluginModel> {
}
return PluginModel.findOne(query)
.then((c: any) => {
.then((c: any) => {
if (!c) return undefined
return c.value

View File

@ -421,6 +421,8 @@ describe('Test video blacklist', function () {
})
it('Should auto blacklist a video on URL import', async function () {
this.timeout(15000)
const attributes = {
targetUrl: getYoutubeVideoUrl(),
name: 'URL import',