Skip to content
This repository was archived by the owner on Feb 6, 2024. It is now read-only.

Commit 0d1a4b3

Browse files
committed
fix content media bug
1 parent a6b6739 commit 0d1a4b3

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

core/controllers/contents.controller.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -271,13 +271,13 @@ exports.update = function (req, res) {
271271
optional: true,
272272
custom: {
273273
options: [function (value) {
274-
if (value === 'draft' || value === 'pushed' || value === 'deleted') {
274+
if (value === 'draft' || value === 'pushed') {
275275
return true;
276276
} else {
277277
return false;
278278
}
279279
}],
280-
errorMessage: 'status 需为 draft 或 pushed 或 deleted'
280+
errorMessage: 'status 需为 draft 或 pushed'
281281
}
282282
},
283283
'deleted': {
@@ -340,7 +340,7 @@ exports.update = function (req, res) {
340340
},
341341
custom: {
342342
options: [function (value) {
343-
if (value === 'draft' || value === 'pushed' || value === 'deleted') {
343+
if (value === 'draft' || value === 'pushed') {
344344
return true;
345345
} else {
346346
return false;
@@ -442,11 +442,11 @@ exports.update = function (req, res) {
442442
data.alias = req.body.alias;
443443
data.date = req.body.date;
444444
data.thumbnail = req.body.thumbnail;
445-
data.media = req.body.media;
445+
data.media = req.body.media || [];
446446
data.abstract = req.body.abstract;
447447
data.content = req.body.content;
448-
data.tags = req.body.tags;
449-
data.extensions = req.body.extensions;
448+
data.tags = req.body.tags || [];
449+
data.extensions = req.body.extensions || {};
450450
}
451451

452452
var query = {

core/services/contents.service.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ exports.save = function (options, callback) {
330330
});
331331
}],
332332
pullMedia: ['updateContent', function (callback, results) {
333-
if (_.isEmpty(data.media)) data.media = [];
333+
if (!data.media) return callback();
334334

335335
var oldMedia = results.updateContent.media;
336336
var newMedia = data.media;
@@ -355,15 +355,15 @@ exports.save = function (options, callback) {
355355
_.pull(pullMedia, newThumbnail);
356356
}
357357

358-
mediaModel.update({_id: {$in: pullMedia}}, {$pull: {quotes: _id}}, {
358+
mediaModel.update({ _id: { $in: pullMedia } }, { $pull: { quotes: _id } }, {
359359
multi: true,
360360
runValidators: true
361361
}, function (err) {
362362
callback(err);
363363
});
364364
}],
365365
addMedia: ['updateContent', function (callback, results) {
366-
if (_.isEmpty(data.media)) data.media = [];
366+
if (!data.media) return callback();
367367

368368
var oldMedia = results.updateContent.media;
369369
var newMedia = data.media;
@@ -382,7 +382,7 @@ exports.save = function (options, callback) {
382382
addMedia.push(newThumbnail);
383383
}
384384

385-
mediaModel.update({_id: {$in: addMedia}}, {$addToSet: {quotes: _id}}, {
385+
mediaModel.update({ _id: { $in: addMedia } }, { $addToSet: { quotes: _id } }, {
386386
multi: true,
387387
runValidators: true
388388
}, function (err) {
@@ -400,7 +400,7 @@ exports.save = function (options, callback) {
400400
} else {
401401
async.auto({
402402
checkAlias: function (callback) {
403-
exports.checkAlias({alias: data.alias}, function (err, alias) {
403+
exports.checkAlias({ alias: data.alias }, function (err, alias) {
404404
if (err) callback(err);
405405

406406
data.alias = alias;

0 commit comments

Comments
 (0)