aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/my-account/my-account-video-channels/my-account-video-channel-create.component.ts6
-rw-r--r--client/src/app/my-account/my-account-video-channels/my-account-video-channel-update.component.ts8
-rw-r--r--server/middlewares/validators/video-channels.ts7
3 files changed, 10 insertions, 11 deletions
diff --git a/client/src/app/my-account/my-account-video-channels/my-account-video-channel-create.component.ts b/client/src/app/my-account/my-account-video-channels/my-account-video-channel-create.component.ts
index c3c0ae63a..0f03548ad 100644
--- a/client/src/app/my-account/my-account-video-channels/my-account-video-channel-create.component.ts
+++ b/client/src/app/my-account/my-account-video-channels/my-account-video-channel-create.component.ts
@@ -64,8 +64,8 @@ export class MyAccountVideoChannelCreateComponent extends MyAccountVideoChannelE
64 const body = this.form.value 64 const body = this.form.value
65 const videoChannelCreate: VideoChannelCreate = { 65 const videoChannelCreate: VideoChannelCreate = {
66 displayName: body['display-name'], 66 displayName: body['display-name'],
67 description: body.description, 67 description: body.description || undefined,
68 support: body.support 68 support: body.support || undefined
69 } 69 }
70 70
71 this.videoChannelService.createVideoChannel(videoChannelCreate).subscribe( 71 this.videoChannelService.createVideoChannel(videoChannelCreate).subscribe(
@@ -84,6 +84,6 @@ export class MyAccountVideoChannelCreateComponent extends MyAccountVideoChannelE
84 } 84 }
85 85
86 getFormButtonTitle () { 86 getFormButtonTitle () {
87 return 'Create this video channel' 87 return 'Create'
88 } 88 }
89} 89}
diff --git a/client/src/app/my-account/my-account-video-channels/my-account-video-channel-update.component.ts b/client/src/app/my-account/my-account-video-channels/my-account-video-channel-update.component.ts
index 3cb8b9e9a..c0dc6a939 100644
--- a/client/src/app/my-account/my-account-video-channels/my-account-video-channel-update.component.ts
+++ b/client/src/app/my-account/my-account-video-channels/my-account-video-channel-update.component.ts
@@ -92,8 +92,8 @@ export class MyAccountVideoChannelUpdateComponent extends MyAccountVideoChannelE
92 const body = this.form.value 92 const body = this.form.value
93 const videoChannelUpdate: VideoChannelUpdate = { 93 const videoChannelUpdate: VideoChannelUpdate = {
94 displayName: body['display-name'], 94 displayName: body['display-name'],
95 description: body.description, 95 description: body.description || undefined,
96 support: body.support 96 support: body.support || undefined
97 } 97 }
98 98
99 this.videoChannelService.updateVideoChannel(this.videoChannelToUpdate.uuid, videoChannelUpdate).subscribe( 99 this.videoChannelService.updateVideoChannel(this.videoChannelToUpdate.uuid, videoChannelUpdate).subscribe(
@@ -112,8 +112,6 @@ export class MyAccountVideoChannelUpdateComponent extends MyAccountVideoChannelE
112 } 112 }
113 113
114 getFormButtonTitle () { 114 getFormButtonTitle () {
115 return this.videoChannelToUpdate 115 return 'Update'
116 ? 'Update ' + this.videoChannelToUpdate.displayName + ' video channel'
117 : 'Update'
118 } 116 }
119} 117}
diff --git a/server/middlewares/validators/video-channels.ts b/server/middlewares/validators/video-channels.ts
index 3af20a1b4..92c0de419 100644
--- a/server/middlewares/validators/video-channels.ts
+++ b/server/middlewares/validators/video-channels.ts
@@ -4,14 +4,15 @@ import { UserRight } from '../../../shared'
4import { isAccountIdExist } from '../../helpers/custom-validators/accounts' 4import { isAccountIdExist } from '../../helpers/custom-validators/accounts'
5import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc' 5import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc'
6import { 6import {
7 isVideoChannelDescriptionValid, isVideoChannelExist, 7 isVideoChannelDescriptionValid,
8 isVideoChannelNameValid, isVideoChannelSupportValid 8 isVideoChannelExist,
9 isVideoChannelNameValid,
10 isVideoChannelSupportValid
9} from '../../helpers/custom-validators/video-channels' 11} from '../../helpers/custom-validators/video-channels'
10import { logger } from '../../helpers/logger' 12import { logger } from '../../helpers/logger'
11import { UserModel } from '../../models/account/user' 13import { UserModel } from '../../models/account/user'
12import { VideoChannelModel } from '../../models/video/video-channel' 14import { VideoChannelModel } from '../../models/video/video-channel'
13import { areValidationErrors } from './utils' 15import { areValidationErrors } from './utils'
14import { AccountModel } from '../../models/account/account'
15 16
16const listVideoAccountChannelsValidator = [ 17const listVideoAccountChannelsValidator = [
17 param('accountId').custom(isIdOrUUIDValid).withMessage('Should have a valid account id'), 18 param('accountId').custom(isIdOrUUIDValid).withMessage('Should have a valid account id'),