mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-06-17 17:10:40 +02:00
Merge branch 'master' into develop
This commit is contained in:
@@ -7,7 +7,6 @@ var utils = require('../../public/src/utils');
|
||||
var db = require('../database');
|
||||
|
||||
module.exports = function (Groups) {
|
||||
|
||||
Groups.create = function (data, callback) {
|
||||
var system = isSystemGroup(data);
|
||||
var groupData;
|
||||
@@ -42,14 +41,14 @@ module.exports = function (Groups) {
|
||||
hidden: parseInt(data.hidden, 10) === 1 ? 1 : 0,
|
||||
system: system ? 1 : 0,
|
||||
private: isPrivate,
|
||||
disableJoinRequests: disableJoinRequests
|
||||
disableJoinRequests: disableJoinRequests,
|
||||
};
|
||||
plugins.fireHook('filter:group.create', {group: groupData, data: data}, next);
|
||||
plugins.fireHook('filter:group.create', { group: groupData, data: data }, next);
|
||||
},
|
||||
function (results, next) {
|
||||
var tasks = [
|
||||
async.apply(db.sortedSetAdd, 'groups:createtime', groupData.createtime, groupData.name),
|
||||
async.apply(db.setObject, 'group:' + groupData.name, groupData)
|
||||
async.apply(db.setObject, 'group:' + groupData.name, groupData),
|
||||
];
|
||||
|
||||
if (data.hasOwnProperty('ownerUid')) {
|
||||
@@ -72,9 +71,8 @@ module.exports = function (Groups) {
|
||||
function (results, next) {
|
||||
plugins.fireHook('action:group.create', {group: groupData});
|
||||
next(null, groupData);
|
||||
}
|
||||
},
|
||||
], callback);
|
||||
|
||||
};
|
||||
|
||||
function isSystemGroup(data) {
|
||||
|
||||
Reference in New Issue
Block a user