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

closes #4701

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2016-05-29 22:27:37 +03:00
parent 9ae8ee861a
commit 26be7c25e4
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/categories/create.js
View File

@@ -62,7 +62,7 @@ module.exports = function(Categories) {
},
function(results, next) {
if (data.cloneFromCid && parseInt(data.cloneFromCid, 10)) {
return Categories.copySettingsFrom(data.cloneFromCid, category.cid, next);
return Categories.copySettingsFrom(data.cloneFromCid, category.cid, !data.parentCid, next);
}
next(null, category);
},
@@ -81,7 +81,7 @@ module.exports = function(Categories) {
return [backgrounds[index], text[index]];
};
Categories.copySettingsFrom = function(fromCid, toCid, callback) {
Categories.copySettingsFrom = function(fromCid, toCid, copyParent, callback) {
var destination;
async.waterfall([
function (next) {
@@ -97,11 +97,11 @@ module.exports = function(Categories) {
destination = results.destination;
var tasks = [];
if (utils.isNumber(results.source.parentCid)) {
if (copyParent && utils.isNumber(results.source.parentCid)) {
tasks.push(async.apply(db.sortedSetAdd, 'cid:' + results.source.parentCid + ':children', results.source.order, toCid));
}
if (destination && utils.isNumber(destination.parentCid)) {
if (copyParent && destination && utils.isNumber(destination.parentCid)) {
tasks.push(async.apply(db.sortedSetRemove, 'cid:' + destination.parentCid + ':children', toCid));
}
@@ -114,8 +114,11 @@ module.exports = function(Categories) {
destination.numRecentReplies = results.source.numRecentReplies;
destination.class = results.source.class;
destination.imageClass = results.source.imageClass;
destination.parentCid = results.source.parentCid || 0;
if (copyParent) {
destination.parentCid = results.source.parentCid || 0;
}
tasks.push(async.apply(db.setObject, 'category:' + toCid, destination));
async.series(tasks, next);

2
src/socket.io/admin/categories.js
View File

@@ -96,7 +96,7 @@ function copyPrivilegesToChildrenRecursive(parentCid, category, callback) {
}
Categories.copySettingsFrom = function(socket, data, callback) {
categories.copySettingsFrom(data.fromCid, data.toCid, callback);
categories.copySettingsFrom(data.fromCid, data.toCid, true, callback);
};
Categories.copyPrivilegesFrom = function(socket, data, callback) {