Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-07 15:51:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

closes #5175

Browse Source
This commit is contained in:
barisusakli
2016-11-11 12:17:12 +03:00
parent fc87f9fce5
commit 1a9dd2311c
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
public/src/modules/helpers.js
View File

@@ -153,22 +153,18 @@
// Groups helpers
helpers.membershipBtn = function (groupObj) {
if (groupObj.name === 'administrators') {
return '';
if (groupObj.isMember && groupObj.name !== 'administrators') {
return '<button class="btn btn-danger" data-action="leave" data-group="' + groupObj.displayName + '"><i class="fa fa-times"></i> [[groups:membership.leave-group]]</button>';
}
if (groupObj.isMember) {
return '<button class="btn btn-danger" data-action="leave" data-group="' + groupObj.displayName + '"><i class="fa fa-times"></i> [[groups:membership.leave-group]]</button>';
if (groupObj.isPending && groupObj.name !== 'administrators') {
return '<button class="btn btn-warning disabled"><i class="fa fa-clock-o"></i> [[groups:membership.invitation-pending]]</button>';
} else if (groupObj.isInvited) {
return '<button class="btn btn-link" data-action="rejectInvite" data-group="' + groupObj.displayName + '">[[groups:membership.reject]]</button><button class="btn btn-success" data-action="acceptInvite" data-group="' + groupObj.name + '"><i class="fa fa-plus"></i> [[groups:membership.accept-invitation]]</button>';
} else if (!groupObj.disableJoinRequests && groupObj.name !== 'administrators') {
return '<button class="btn btn-success" data-action="join" data-group="' + groupObj.displayName + '"><i class="fa fa-plus"></i> [[groups:membership.join-group]]</button>';
} else {
if (groupObj.isPending) {
return '<button class="btn btn-warning disabled"><i class="fa fa-clock-o"></i> [[groups:membership.invitation-pending]]</button>';
} else if (groupObj.isInvited) {
return '<button class="btn btn-link" data-action="rejectInvite" data-group="' + groupObj.displayName + '">[[groups:membership.reject]]</button><button class="btn btn-success" data-action="acceptInvite" data-group="' + groupObj.name + '"><i class="fa fa-plus"></i> [[groups:membership.accept-invitation]]</button>';
} else if (!groupObj.disableJoinRequests) {
return '<button class="btn btn-success" data-action="join" data-group="' + groupObj.displayName + '"><i class="fa fa-plus"></i> [[groups:membership.join-group]]</button>';
} else {
return '';
}
return '';
}
};

17
src/groups/create.js
View File

@@ -9,12 +9,13 @@ var db = require('../database');
module.exports = function (Groups) {
Groups.create = function (data, callback) {
var system = data.system === true || parseInt(data.system, 10) === 1 ||
data.name === 'administrators' || data.name === 'registered-users' || data.name === 'Global Moderators' ||
Groups.isPrivilegeGroup(data.name);
var system = isSystemGroup(data);
var groupData;
var timestamp = data.timestamp || Date.now();
var disableJoinRequests = parseInt(data.disableJoinRequests, 10) === 1 ? 1 : 0;
if (data.name === 'administrators') {
disableJoinRequests = 1;
}
async.waterfall([
function (next) {
validateGroupName(data.name, next);
@@ -41,7 +42,7 @@ module.exports = function (Groups) {
hidden: parseInt(data.hidden, 10) === 1 ? 1 : 0,
system: system ? 1 : 0,
private: isPrivate,
disableJoinRequests: parseInt(data.disableJoinRequests, 10) === 1 ? 1 : 0
disableJoinRequests: disableJoinRequests
};
plugins.fireHook('filter:group.create', {group: groupData, data: data}, next);
},
@@ -76,6 +77,12 @@ module.exports = function (Groups) {
};
function isSystemGroup(data) {
return data.system === true || parseInt(data.system, 10) === 1 ||
data.name === 'administrators' || data.name === 'registered-users' || data.name === 'Global Moderators' ||
Groups.isPrivilegeGroup(data.name);
}
function validateGroupName(name, callback) {
if (!name) {
return callback(new Error('[[error:group-name-too-short]]'));