mirror of
				https://github.com/NodeBB/NodeBB.git
				synced 2025-11-03 20:45:58 +01:00 
			
		
		
		
	closes #2754
moved group edit from modal to its own page added hidden/private to group edit in acp, they were only in the client groups page moved add users above member list
This commit is contained in:
		@@ -15,7 +15,6 @@ var async = require('async'),
 | 
			
		||||
	events = require('../events'),
 | 
			
		||||
	languages = require('../languages'),
 | 
			
		||||
	plugins = require('../plugins'),
 | 
			
		||||
	groups = require('../groups'),
 | 
			
		||||
	validator = require('validator');
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@@ -24,7 +23,7 @@ var adminController = {
 | 
			
		||||
	tags: {},
 | 
			
		||||
	flags: {},
 | 
			
		||||
	topics: {},
 | 
			
		||||
	groups: {},
 | 
			
		||||
	groups: require('./admin/groups'),
 | 
			
		||||
	appearance: {},
 | 
			
		||||
	extend: {
 | 
			
		||||
		widgets: {}
 | 
			
		||||
@@ -376,23 +375,6 @@ adminController.extend.rewards = function(req, res, next) {
 | 
			
		||||
	});
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
adminController.groups.get = function(req, res, next) {
 | 
			
		||||
	groups.getGroupsFromSet('groups:createtime', req.uid, 0, -1, function(err, groups) {
 | 
			
		||||
		if (err) {
 | 
			
		||||
			return next(err);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		groups = groups.filter(function(group) {
 | 
			
		||||
			return group && group.name.indexOf(':privileges:') === -1 && group.name !== 'registered-users';
 | 
			
		||||
		});
 | 
			
		||||
 | 
			
		||||
		res.render('admin/manage/groups', {
 | 
			
		||||
			groups: groups,
 | 
			
		||||
			yourid: req.user.uid
 | 
			
		||||
		});
 | 
			
		||||
	});
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
adminController.themes.get = function(req, res, next) {
 | 
			
		||||
	var themeDir = path.join(__dirname, '../../node_modules/' + req.params.theme);
 | 
			
		||||
	fs.exists(themeDir, function(exists) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user