From 7d8e778ad031873b2bcc273d281baf6559610f71 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 7 May 2018 11:31:23 +0200
Subject: Fix video channel update/create on empty fields

---
 .../my-account-video-channel-create.component.ts                  | 6 +++---
 .../my-account-video-channel-update.component.ts                  | 8 +++-----
 server/middlewares/validators/video-channels.ts                   | 7 ++++---
 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
     const body = this.form.value
     const videoChannelCreate: VideoChannelCreate = {
       displayName: body['display-name'],
-      description: body.description,
-      support: body.support
+      description: body.description || undefined,
+      support: body.support || undefined
     }
 
     this.videoChannelService.createVideoChannel(videoChannelCreate).subscribe(
@@ -84,6 +84,6 @@ export class MyAccountVideoChannelCreateComponent extends MyAccountVideoChannelE
   }
 
   getFormButtonTitle () {
-    return 'Create this video channel'
+    return 'Create'
   }
 }
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
     const body = this.form.value
     const videoChannelUpdate: VideoChannelUpdate = {
       displayName: body['display-name'],
-      description: body.description,
-      support: body.support
+      description: body.description || undefined,
+      support: body.support || undefined
     }
 
     this.videoChannelService.updateVideoChannel(this.videoChannelToUpdate.uuid, videoChannelUpdate).subscribe(
@@ -112,8 +112,6 @@ export class MyAccountVideoChannelUpdateComponent extends MyAccountVideoChannelE
   }
 
   getFormButtonTitle () {
-    return this.videoChannelToUpdate
-      ? 'Update ' + this.videoChannelToUpdate.displayName + ' video channel'
-      : 'Update'
+    return 'Update'
   }
 }
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'
 import { isAccountIdExist } from '../../helpers/custom-validators/accounts'
 import { isIdOrUUIDValid } from '../../helpers/custom-validators/misc'
 import {
-  isVideoChannelDescriptionValid, isVideoChannelExist,
-  isVideoChannelNameValid, isVideoChannelSupportValid
+  isVideoChannelDescriptionValid,
+  isVideoChannelExist,
+  isVideoChannelNameValid,
+  isVideoChannelSupportValid
 } from '../../helpers/custom-validators/video-channels'
 import { logger } from '../../helpers/logger'
 import { UserModel } from '../../models/account/user'
 import { VideoChannelModel } from '../../models/video/video-channel'
 import { areValidationErrors } from './utils'
-import { AccountModel } from '../../models/account/account'
 
 const listVideoAccountChannelsValidator = [
   param('accountId').custom(isIdOrUUIDValid).withMessage('Should have a valid account id'),
-- 
cgit v1.2.3