From 06be7ed0b27b371465c5d1b7f92b4adfb0b866ea Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 25 May 2018 08:38:59 +0200 Subject: Reload my videos after delete --- .../+my-account/my-account-videos/my-account-videos.component.ts | 6 +++--- server/models/video/video.ts | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/client/src/app/+my-account/my-account-videos/my-account-videos.component.ts b/client/src/app/+my-account/my-account-videos/my-account-videos.component.ts index d8c919fee..6ab6c2aa5 100644 --- a/client/src/app/+my-account/my-account-videos/my-account-videos.component.ts +++ b/client/src/app/+my-account/my-account-videos/my-account-videos.component.ts @@ -88,7 +88,8 @@ export class MyAccountVideosComponent extends AbstractVideoList implements OnIni .subscribe( res => { this.notificationsService.success('Success', `${toDeleteVideosIds.length} videos deleted.`) - this.buildVideoPages() + this.abortSelectionMode() + this.reloadVideos() }, err => this.notificationsService.error('Error', err.message) @@ -103,8 +104,7 @@ export class MyAccountVideosComponent extends AbstractVideoList implements OnIni .subscribe( status => { this.notificationsService.success('Success', `Video ${video.name} deleted.`) - this.spliceVideosById(video.id) - this.buildVideoPages() + this.reloadVideos() }, error => this.notificationsService.error('Error', error.message) diff --git a/server/models/video/video.ts b/server/models/video/video.ts index 967a899f5..012a758ee 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -5,7 +5,6 @@ import * as parseTorrent from 'parse-torrent' import { join } from 'path' import * as Sequelize from 'sequelize' import { - AfterDestroy, AllowNull, BeforeDestroy, BelongsTo, @@ -32,7 +31,11 @@ import { Video, VideoDetails, VideoFile } from '../../../shared/models/videos' import { VideoFilter } from '../../../shared/models/videos/video-query.type' import { activityPubCollection } from '../../helpers/activitypub' import { - createTorrentPromise, peertubeTruncate, renamePromise, statPromise, unlinkPromise, + createTorrentPromise, + peertubeTruncate, + renamePromise, + statPromise, + unlinkPromise, writeFilePromise } from '../../helpers/core-utils' import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' -- cgit v1.2.3