Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-05 03:51:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into user-icons

Browse Source 
Conflicts:
	public/src/app.js
	public/src/client/account/edit.js
This commit is contained in:
Julian Lam
2015-10-07 02:14:03 -04:00
parent 896abb59d3 8b3f1684f7
commit 4c96f95330
180 changed files with 1034 additions and 800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/posts/edit.js
View File

@@ -34,6 +34,9 @@ module.exports = function(Posts) {
Posts.getPostData(data.pid, next);
},
function (_postData, next) {
if (!_postData) {
return next(new Error('[[error:no-post]]'));
}
postData = _postData;
postData.content = data.content;
postData.edited = now;

14
src/posts/tools.js
View File

@@ -18,10 +18,16 @@ module.exports = function(Posts) {
function togglePostDelete(uid, pid, isDelete, callback) {
async.waterfall([
function(next) {
function (next) {
Posts.exists(pid, next);
},
function (exists, next) {
if (!exists) {
return next(new Error('[[error:no-post]]'));
}
Posts.getPostField(pid, 'deleted', next);
},
function(deleted, next) {
function (deleted, next) {
if (parseInt(deleted, 10) === 1 && isDelete) {
return next(new Error('[[error:post-already-deleted]]'));
} else if(parseInt(deleted, 10) !== 1 && !isDelete) {
@@ -30,13 +36,13 @@ module.exports = function(Posts) {
privileges.posts.canEdit(pid, uid, next);
},
function(canEdit, next) {
function (canEdit, next) {
if (!canEdit) {
return next(new Error('[[error:no-privileges]]'));
}
next();
}
], function(err) {
], function (err) {
if (err) {
return callback(err);
}