From 22e909224c023c10699fce5c8b9db4be2cd049d7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 18 Mar 2022 16:31:12 +0100 Subject: Don't allow video edition if not enabled --- client/src/app/shared/shared-main/video/video.model.ts | 6 ++++++ .../shared-video-miniature/video-actions-dropdown.component.ts | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'client/src/app/shared') diff --git a/client/src/app/shared/shared-main/video/video.model.ts b/client/src/app/shared/shared-main/video/video.model.ts index 8e275181c..612fcf16c 100644 --- a/client/src/app/shared/shared-main/video/video.model.ts +++ b/client/src/app/shared/shared-main/video/video.model.ts @@ -228,6 +228,12 @@ export class Video implements VideoServerModel { return user && this.isLocal === true && (this.account.name === user.username || user.hasRight(UserRight.UPDATE_ANY_VIDEO)) } + isEditableBy (user: AuthUser, videoEditorEnabled: boolean) { + return videoEditorEnabled && + this.state?.id === VideoState.PUBLISHED && + this.isUpdatableBy(user) + } + canRemoveFiles (user: AuthUser) { return this.isLocal && user.hasRight(UserRight.MANAGE_VIDEO_FILES) && diff --git a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts index abbfc63f8..29a711378 100644 --- a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts +++ b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnChanges, Output, ViewChild } from '@a import { AuthService, ConfirmService, Notifier, ScreenService, ServerService } from '@app/core' import { BlocklistService, VideoBlockComponent, VideoBlockService, VideoReportComponent } from '@app/shared/shared-moderation' import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap' -import { VideoCaption, VideoState } from '@shared/models' +import { VideoCaption } from '@shared/models' import { Actor, DropdownAction, @@ -153,9 +153,7 @@ export class VideoActionsDropdownComponent implements OnChanges { } isVideoEditable () { - return this.serverService.getHTMLConfig().videoEditor.enabled && - this.video.state?.id === VideoState.PUBLISHED && - this.video.isUpdatableBy(this.user) + return this.video.isEditableBy(this.user, this.serverService.getHTMLConfig().videoEditor.enabled) } isVideoRemovable () { -- cgit v1.2.3