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

closes #2458

Browse Source
This commit is contained in:
barisusakli
2014-12-21 16:29:32 -05:00
parent 2ea5f85d9b
commit 2f8e6a1f2b
6 changed files with 90 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/src/admin/manage/users.js
View File

@@ -78,6 +78,16 @@ define('admin/manage/users', ['admin/modules/selectable'], function(selectable)
return false;
});
$('.reset-flags').on('click', function() {
var uids = getSelectedUids();
if (!uids.length) {
return;
}
socket.emit('admin.user.resetFlags', uids, done('Flags(s) reset!'));
return false;
});
$('.admin-user').on('click', function() {
var uids = getSelectedUids();
if (!uids.length) {

15
src/database/mongo/sets.js
View File

@@ -186,10 +186,23 @@ module.exports = function(db, module) {
return callback(null, 0);
}
db.collection('objects').findOne({_key: key}, {_id: 0}, function(err, data) {
return callback(err, data ? data.members.length : 0);
callback(err, data ? data.members.length : 0);
});
};
module.setsCount = function(keys, callback) {
module.getSetsMembers(keys, function(err, setsMembers) {
if (err) {
return callback(err);
}
var counts = setsMembers.map(function(members) {
return (members && members.length) || 0;
});
callback(null, counts);
});
}
module.setRemoveRandom = function(key, callback) {
callback = callback || function() {};
db.collection('objects').findOne({_key:key}, function(err, data) {

8
src/database/redis/sets.js
View File

@@ -94,6 +94,14 @@ module.exports = function(redisClient, module) {
redisClient.scard(key, callback);
};
module.setsCount = function(keys, callback) {
var multi = redisClient.multi();
for (var i=0; i<keys.length; ++i) {
multi.scard(keys[i]);
}
multi.exec(callback);
};
module.setRemoveRandom = function(key, callback) {
redisClient.spop(key, callback);
};

47
src/socket.io/admin/user.js
View File

@@ -1,7 +1,8 @@
"use strict";
var groups = require('../../groups'),
var db = require('../../database'),
groups = require('../../groups'),
user = require('../../user'),
events = require('../../events'),
websockets = require('../index'),
@@ -104,6 +105,14 @@ User.resetLockouts = function(socket, uids, callback) {
async.each(uids, user.auth.resetLockout, callback);
};
User.resetFlags = function(socket, uids, callback) {
if (!Array.isArray(uids)) {
return callback(new Error('[[error:invalid-data]]'));
}
user.resetFlags(uids, callback);
};
User.validateEmail = function(socket, uids, callback) {
if (!Array.isArray(uids)) {
return callback(new Error('[[error:invalid-data]]'));
@@ -166,24 +175,42 @@ User.deleteUsers = function(socket, uids, callback) {
};
User.search = function(socket, data, callback) {
user.search(data.query, data.type, function(err, data) {
function getEmail(userData, next) {
user.getUserField(userData.uid, 'email', function(err, email) {
user.search(data.query, data.type, function(err, searchData) {
if (err) {
return next(err);
return callback(err);
}
if (!searchData.users.length) {
return callback(null, searchData);
}
userData.email = email;
next();
var userData = searchData.users;
var uids = userData.map(function(user) {
return user && user.uid;
});
}
async.parallel({
users: function(next) {
user.getMultipleUserFields(uids, ['email'], next);
},
flagCounts: function(next) {
var sets = uids.map(function(uid) {
return 'uid:' + uid + ':flagged_by';
});
db.setsCount(sets, next);
}
}, function(err, results) {
if (err) {
return callback(err);
}
async.each(data.users, getEmail, function(err) {
callback(err, data);
userData.forEach(function(user, index) {
if (user) {
user.email = (results.users[index] && results.users[index].email) || '';
user.flags = results.flagCounts[index] || 0;
}
});
callback(null, searchData);
});
});
};

10
src/user/admin.js
View File

@@ -67,4 +67,14 @@ module.exports = function(User) {
db.sortedSetRemove('users:banned', uid, callback);
});
};
User.resetFlags = function(uids, callback) {
if (!Array.isArray(uids) || !uids.length) {
return callback();
}
var keys = uids.map(function(uid) {
return 'uid:' + uid + ':flagged_by';
});
db.deleteAll(keys, callback);
};
};

11
src/views/admin/manage/users.tpl
View File

@@ -23,6 +23,7 @@
<li><a href="#" class="ban-user"><i class="fa fa-fw fa-gavel"></i> Ban User</a></li>
<li><a href="#" class="unban-user"><i class="fa fa-fw fa-comment-o"></i> Unban User</a></li>
<li><a href="#" class="reset-lockout"><i class="fa fa-fw fa-unlock"></i> Reset Lockout</a></li>
<li><a href="#" class="reset-flags"><i class="fa fa-fw fa-flag"></i> Reset Flags</a></li>
<li class="divider"></li>
<li><a href="#" class="delete-user"><i class="fa fa-fw fa-trash-o"></i> Delete User</a></li>
</ul>
@@ -43,22 +44,19 @@
<i class="fa fa-spinner fa-spin hidden"></i>
<span id="user-notfound-notify" class="label label-danger hide">User not found!</span><br/>
</div>
<ul id="users-container">
<!-- BEGIN users -->
<div class="users-box" data-uid="{users.uid}" data-username="{users.username}">
<div class="user-image">
<img src="{users.picture}" class="img-thumbnail user-selectable"/>
<div class="labels">
<!-- IF requireEmailConfirmation -->
<!-- IF config.requireEmailConfirmation -->
<!-- IF !users.email:confirmed -->
<span class="notvalidated label label-danger">Not Validated</span>
<!-- ENDIF !users.email:confirmed -->
<!-- ENDIF requireEmailConfirmation -->
<!-- ENDIF config.requireEmailConfirmation -->
<span class="administrator label label-primary <!-- IF !users.administrator -->hide<!-- ENDIF !users.administrator -->">Admin</span>
<span class="ban label label-danger <!-- IF !users.banned -->hide<!-- ENDIF !users.banned -->">Banned</span>
</div>
@@ -68,6 +66,9 @@
<!-- IF users.email -->
<small><span title="{users.email}">{users.email}</span></small>
<!-- ENDIF users.email -->
<!-- IF users.flags -->
<div><small><span><i class="fa fa-flag"></i> {users.flags}</span></small></div>
<!-- ENDIF users.flags -->
</div>
<!-- END users -->
</ul>