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

Fix video channel update/create on empty fields

pull/545/head
Chocobozzz 2018-05-07 11:31:23 +02:00
parent b0ae905e7b
commit 7d8e778ad0
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/app/my-account/my-account-video-channels/my-account-video-channel-create.component.ts
View File

@ -64,8 +64,8 @@ export class MyAccountVideoChannelCreateComponent extends MyAccountVideoChannelE
const body = this.form.value const body = this.form.value
const videoChannelCreate: VideoChannelCreate = { const videoChannelCreate: VideoChannelCreate = {
displayName: body['display-name'], displayName: body['display-name'],
description: body.description, description: body.description || undefined,
support: body.support support: body.support || undefined
} }
this.videoChannelService.createVideoChannel(videoChannelCreate).subscribe( this.videoChannelService.createVideoChannel(videoChannelCreate).subscribe(
@ -84,6 +84,6 @@ export class MyAccountVideoChannelCreateComponent extends MyAccountVideoChannelE
} }
getFormButtonTitle () { getFormButtonTitle () {
return 'Create this video channel' return 'Create'
} }
} }

8
client/src/app/my-account/my-account-video-channels/my-account-video-channel-update.component.ts
View File

@ -92,8 +92,8 @@ export class MyAccountVideoChannelUpdateComponent extends MyAccountVideoChannelE
const body = this.form.value const body = this.form.value
const videoChannelUpdate: VideoChannelUpdate = { const videoChannelUpdate: VideoChannelUpdate = {
displayName: body['display-name'], displayName: body['display-name'],
description: body.description, description: body.description || undefined,
support: body.support support: body.support || undefined
} }
this.videoChannelService.updateVideoChannel(this.videoChannelToUpdate.uuid, videoChannelUpdate).subscribe( this.videoChannelService.updateVideoChannel(this.videoChannelToUpdate.uuid, videoChannelUpdate).subscribe(
@ -112,8 +112,6 @@ export class MyAccountVideoChannelUpdateComponent extends MyAccountVideoChannelE
} }
getFormButtonTitle () { getFormButtonTitle () {
return this.videoChannelToUpdate return 'Update'
? 'Update ' + this.videoChannelToUpdate.displayName + ' video channel'
: 'Update'
} }
} }

7
server/middlewares/validators/video-channels.ts
View File

@ -4,14 +4,15 @@ import { UserRight } from '../../../shared'
import { isAccountIdExist } from '../../helpers/custom-validators/accounts' import { isAccountIdExist } from '../../helpers/custom-validators/accounts'
import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc' import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc'
import { import {
isVideoChannelDescriptionValid, isVideoChannelExist, isVideoChannelDescriptionValid,
isVideoChannelNameValid, isVideoChannelSupportValid isVideoChannelExist,
isVideoChannelNameValid,
isVideoChannelSupportValid
} from '../../helpers/custom-validators/video-channels' } from '../../helpers/custom-validators/video-channels'
import { logger } from '../../helpers/logger' import { logger } from '../../helpers/logger'
import { UserModel } from '../../models/account/user' import { UserModel } from '../../models/account/user'
import { VideoChannelModel } from '../../models/video/video-channel' import { VideoChannelModel } from '../../models/video/video-channel'
import { areValidationErrors } from './utils' import { areValidationErrors } from './utils'
import { AccountModel } from '../../models/account/account'
const listVideoAccountChannelsValidator = [ const listVideoAccountChannelsValidator = [
param('accountId').custom(isIdOrUUIDValid).withMessage('Should have a valid account id'), param('accountId').custom(isIdOrUUIDValid).withMessage('Should have a valid account id'),