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

Fix unset video language on video update

pull/71/head
Chocobozzz 2017-05-05 14:29:58 +02:00
parent 9eee32fc34
commit c24ac1c18e
4 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/app/videos/shared/video.service.ts
View File

@ -81,14 +81,17 @@ export class VideoService {
} }
updateVideo(video: Video) { updateVideo(video: Video) {
const language = video.language ? video.language : null;
const body = { const body = {
name: video.name, name: video.name,
category: video.category, category: video.category,
licence: video.licence, licence: video.licence,
language: video.language, language,
description: video.description, description: video.description,
tags: video.tags tags: video.tags
}; };
const headers = new Headers({ 'Content-Type': 'application/json' }); const headers = new Headers({ 'Content-Type': 'application/json' });
const options = new RequestOptions({ headers: headers }); const options = new RequestOptions({ headers: headers });

10
client/src/app/videos/video-edit/video-update.component.ts
View File

@ -98,7 +98,17 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
); );
} }
checkForm() {
this.forceCheck();
return this.form.valid;
}
update() { update() {
if (this.checkForm() === false) {
return;
}
this.video.patch(this.form.value); this.video.patch(this.form.value);
this.videoService.updateVideo(this.video) this.videoService.updateVideo(this.video)

12
server/controllers/api/videos.js
View File

@ -444,12 +444,12 @@ function updateVideo (req, res, finalCallback) {
transaction: t transaction: t
} }
if (videoInfosToUpdate.name) videoInstance.set('name', videoInfosToUpdate.name) if (videoInfosToUpdate.name !== undefined) videoInstance.set('name', videoInfosToUpdate.name)
if (videoInfosToUpdate.category) videoInstance.set('category', videoInfosToUpdate.category) if (videoInfosToUpdate.category !== undefined) videoInstance.set('category', videoInfosToUpdate.category)
if (videoInfosToUpdate.licence) videoInstance.set('licence', videoInfosToUpdate.licence) if (videoInfosToUpdate.licence !== undefined) videoInstance.set('licence', videoInfosToUpdate.licence)
if (videoInfosToUpdate.language) videoInstance.set('language', videoInfosToUpdate.language) if (videoInfosToUpdate.language !== undefined) videoInstance.set('language', videoInfosToUpdate.language)
if (videoInfosToUpdate.nsfw) videoInstance.set('nsfw', videoInfosToUpdate.nsfw) if (videoInfosToUpdate.nsfw !== undefined) videoInstance.set('nsfw', videoInfosToUpdate.nsfw)
if (videoInfosToUpdate.description) videoInstance.set('description', videoInfosToUpdate.description) if (videoInfosToUpdate.description !== undefined) videoInstance.set('description', videoInfosToUpdate.description)
videoInstance.save(options).asCallback(function (err) { videoInstance.save(options).asCallback(function (err) {
return callback(err, t, tagInstances) return callback(err, t, tagInstances)

2
server/helpers/custom-validators/videos.js
View File

@ -53,7 +53,7 @@ function isVideoLicenceValid (value) {
} }
function isVideoLanguageValid (value) { function isVideoLanguageValid (value) {
return constants.VIDEO_LANGUAGES[value] !== undefined return value === null || constants.VIDEO_LANGUAGES[value] !== undefined
} }
function isVideoNSFWValid (value) { function isVideoNSFWValid (value) {