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

closes #747

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-08 22:53:55 -05:00
parent 3a6db04be5
commit dabd2f29af
4 changed files with 86 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
public/src/forum/admin/users.js
View File

@@ -93,7 +93,7 @@ define(function() {
var parent = adminBtn.parents('.users-box');
var isBanned = isUserBanned(adminBtn);
var uid = getUID(adminBtn);
if(uid === yourid){
app.alert({
title: 'Error',
@@ -107,7 +107,7 @@ define(function() {
adminBtn.attr('value', 'UnMake Admin').html('Remove Admin');
parent.attr('data-admin', 1);
updateUserBanButtons();
} else if(uid !== yourid) {
bootbox.confirm('Do you really want to remove this user as admin "' + parent.attr('data-username') + '"?', function(confirm) {
if (confirm) {
@@ -115,11 +115,11 @@ define(function() {
adminBtn.attr('value', 'Make Admin').html('Make Admin');
parent.attr('data-admin', 0);
updateUserBanButtons();
}
});
}
return false;
});
@@ -187,8 +187,35 @@ define(function() {
var username = $('#search-user').val();
jQuery('.fa-spinner').removeClass('none');
socket.emit('api:admin.user.search', username);
socket.emit('api:admin.user.search', username, function(err, data) {
console.log(data);
if(err) {
return app.alertError(err.message);
}
var html = templates.prepare(templates['admin/users'].blocks['users']).parse({
users: data
}),
userListEl = document.querySelector('.users');
userListEl.innerHTML = html;
jQuery('.fa-spinner').addClass('none');
if (data && data.length === 0) {
$('#user-notfound-notify').html('User not found!')
.show()
.addClass('label-danger')
.removeClass('label-success');
} else {
$('#user-notfound-notify').html(data.length + ' user' + (data.length > 1 ? 's' : '') + ' found!')
.show()
.addClass('label-success')
.removeClass('label-danger');
}
initUsers();
});
}, 250);
});
@@ -196,32 +223,6 @@ define(function() {
handleUserCreate();
socket.removeAllListeners('api:admin.user.search');
socket.on('api:admin.user.search', function(data) {
var html = templates.prepare(templates['admin/users'].blocks['users']).parse({
users: data
}),
userListEl = document.querySelector('.users');
userListEl.innerHTML = html;
jQuery('.fa-spinner').addClass('none');
if (data && data.length === 0) {
$('#user-notfound-notify').html('User not found!')
.show()
.addClass('label-danger')
.removeClass('label-success');
} else {
$('#user-notfound-notify').html(data.length + ' user' + (data.length > 1 ? 's' : '') + ' found!')
.show()
.addClass('label-success')
.removeClass('label-danger');
}
initUsers();
});
function onUsersLoaded(users) {
var html = templates.prepare(templates['admin/users'].blocks['users']).parse({
users: users

57
public/src/forum/users.js
View File

@@ -47,39 +47,40 @@ define(function() {
jQuery('#user-notfound-notify').html('<i class="fa fa-spinner fa-spin"></i>');
setTimeout(function() {
socket.emit('api:admin.user.search', username);
socket.emit('api:admin.user.search', username, function(err, data) {
console.log(err, data);
if(err) {
return app.alert(err.message);
}
if (!data) {
$('#user-notfound-notify').html('You need to be logged in to search!');
$('#user-notfound-notify').parent().addClass('btn-warning label-warning');
return;
}
var html = templates.prepare(templates['users'].blocks['users']).parse({
users: data
}),
userListEl = $('#users-container');
userListEl.html(html);
if (data && data.length === 0) {
$('#user-notfound-notify').html('User not found!');
$('#user-notfound-notify').parent().addClass('btn-warning label-warning');
} else {
$('#user-notfound-notify').html(data.length + ' user' + (data.length > 1 ? 's' : '') + ' found!');
$('#user-notfound-notify').parent().addClass('btn-success label-success');
}
});
}, 500); //replace this with global throttling function/constant
}, 250);
});
socket.removeAllListeners('api:admin.user.search');
socket.on('api:admin.user.search', function(data) {
if (data === null) {
$('#user-notfound-notify').html('You need to be logged in to search!');
$('#user-notfound-notify').parent().addClass('btn-warning label-warning');
return;
}
var html = templates.prepare(templates['users'].blocks['users']).parse({
users: data
}),
userListEl = $('#users-container');
userListEl.html(html);
if (data && data.length === 0) {
$('#user-notfound-notify').html('User not found!');
$('#user-notfound-notify').parent().addClass('btn-warning label-warning');
} else {
$('#user-notfound-notify').html(data.length + ' user' + (data.length > 1 ? 's' : '') + ' found!');
$('#user-notfound-notify').parent().addClass('btn-success label-success');
}
});
socket.on('api:user.isOnline', function(data) {
if(getActiveSection() == 'online' && !loadingMoreUsers) {
startLoading('users:online', 0, true);

4
src/user.js
View File

@@ -487,9 +487,9 @@ var bcrypt = require('bcrypt'),
User.search = function(username, callback) {
if (!username) {
callback([]);
return;
return callback([]);
}
db.search('user', username, function(err, uids) {
if (err) {
console.log(err);

31
src/websockets.js
View File

@@ -1056,15 +1056,30 @@ websockets.init = function(io) {
});
socket.on('api:admin.user.search', function(username, callback) {
if (uid && uid > 0) {
user.search(username, function(data) {
if (!callback) socket.emit('api:admin.user.search', data);
else callback(null, data);
});
} else {
if (!callback) socket.emit('api:admin.user.search', null);
else callback();
if (!(uid && uid > 0)) {
return callback();
}
user.search(username, function(data) {
function isAdmin(userData, next) {
user.isAdministrator(userData.uid, function(err, isAdmin) {
if(err) {
return next(err);
}
userData.administrator = isAdmin?'1':'0';
next();
});
}
async.each(data, isAdmin, function(err) {
if(err) {
return callback({message: err.message});
}
callback(null, data);
});
});
});
socket.on('api:admin.categories.search', function(username, cid, callback) {