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

guests can no longer attempt to join a group, #2588

Browse Source
This commit is contained in:
Julian Lam
2015-01-15 10:44:27 -05:00
parent cd99324286
commit 36a49cd994
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/client/groups/details.js
View File

@@ -58,7 +58,7 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker',
if (!err) { if (!err) {
ajaxify.refresh(); ajaxify.refresh();
} else { } else {
app.alertError(err); app.alertError(err.message);
} }
}); });
break; break;

14
src/groups.js
View File

@@ -599,11 +599,15 @@ var async = require('async'),
}; };
Groups.requestMembership = function(groupName, uid, callback) { Groups.requestMembership = function(groupName, uid, callback) {
db.setAdd('group:' + groupName + ':pending', uid, callback); if (parseInt(uid, 10) > 0) {
plugins.fireHook('action:groups.requestMembership', { db.setAdd('group:' + groupName + ':pending', uid, callback);
groupName: groupName, plugins.fireHook('action:groups.requestMembership', {
uid: uid groupName: groupName,
}); uid: uid
});
} else {
callback(new Error('[[error:not-logged-in]]'));
}
}; };
Groups.acceptMembership = function(groupName, uid, callback) { Groups.acceptMembership = function(groupName, uid, callback) {