mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-03-05 03:51:26 +01:00
delete user button in admin/users. the latest/top posters and most reputation sorting is working now in admin/users
This commit is contained in:
@@ -63,7 +63,7 @@
|
||||
<li class="nav-header">NodeBB</li>
|
||||
<li class='active'><a href='/admin/index'><i class='icon-home'></i> Home</a></li>
|
||||
<li class=''><a href='/admin/categories'><i class='icon-folder-close-alt'></i> Categories</a></li>
|
||||
<li class=''><a href='/admin/users'><i class='icon-user'></i> Users</a></li>
|
||||
<li class=''><a href='/admin/users/latest'><i class='icon-user'></i> Users</a></li>
|
||||
<li class=''><a href='/admin/topics'><i class='icon-book'></i> Topics</a></li>
|
||||
<li class=''><a href='/admin/themes'><i class='icon-th'></i> Themes</a></li>
|
||||
<li class=''><a href='/admin/settings'><i class='icon-cogs'></i> Settings</a></li>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<h1>Users</h1>
|
||||
<hr />
|
||||
<ul class="nav nav-pills">
|
||||
<li class='active'><a href='/admin/users'>Latest Users</a></li>
|
||||
<li class='active'><a href='/admin/users/latest'>Latest Users</a></li>
|
||||
<li class=''><a href='/admin/users/sort-posts'>Top Posters</a></li>
|
||||
<li class=''><a href='/admin/users/sort-reputation'>Most Reputation</a></li>
|
||||
<li class=''><a href='/admin/users/search'>Search</a></li>
|
||||
@@ -14,7 +14,7 @@
|
||||
</div>
|
||||
|
||||
<!-- BEGIN users -->
|
||||
<div class="users-box well" data-uid="{users.uid}">
|
||||
<div class="users-box well" data-uid="{users.uid}" data-admin="{users.administrator}" data-username="{users.username}">
|
||||
<a href="/users/{users.userslug}">
|
||||
<img src="{users.picture}" class="user-8080-picture"/>
|
||||
</a>
|
||||
@@ -30,7 +30,11 @@
|
||||
<i class='icon-pencil'></i>
|
||||
</div>
|
||||
<div>
|
||||
<a href="#" class="btn admin-btn" data-admin="{users.administrator}" data-username="{users.username}">Admin</a>
|
||||
<a href="#" class="btn admin-btn">Admin</a>
|
||||
</div>
|
||||
<br/>
|
||||
<div>
|
||||
<a href="#" class="btn delete-btn btn-danger">Delete</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@@ -58,9 +62,19 @@
|
||||
}
|
||||
});
|
||||
|
||||
function isUserAdmin(element) {
|
||||
var parent = $(element).parents('.users-box');
|
||||
return (parent.attr('data-admin') !== "0");
|
||||
}
|
||||
|
||||
function getUID(element) {
|
||||
var parent = $(element).parents('.users-box');
|
||||
return parent.attr('data-uid');
|
||||
}
|
||||
|
||||
jQuery('.admin-btn').each(function(index, element) {
|
||||
var adminBtn = $(element);
|
||||
var isAdmin = adminBtn.attr('data-admin') !== "0";
|
||||
var isAdmin = isUserAdmin(adminBtn);
|
||||
|
||||
if(isAdmin)
|
||||
adminBtn.addClass('btn-success');
|
||||
@@ -69,30 +83,56 @@
|
||||
|
||||
});
|
||||
|
||||
jQuery('.delete-btn').each(function(index, element) {
|
||||
var deleteBtn = $(element);
|
||||
var isAdmin = isUserAdmin(deleteBtn);
|
||||
|
||||
if(isAdmin)
|
||||
deleteBtn.addClass('disabled');
|
||||
else
|
||||
deleteBtn.show();
|
||||
});
|
||||
|
||||
jQuery('.admin-btn').on('click', function() {
|
||||
var adminBtn = $(this);
|
||||
var isAdmin = adminBtn.attr('data-admin') !== "0";
|
||||
var isAdmin = isUserAdmin(adminBtn);
|
||||
var parent = adminBtn.parents('.users-box');
|
||||
|
||||
var uid = parent.attr('data-uid');
|
||||
var uid = getUID(adminBtn);
|
||||
|
||||
if(isAdmin) {
|
||||
socket.emit('api:admin.user.removeAdmin', uid);
|
||||
adminBtn.removeClass('btn-success');
|
||||
adminBtn.attr('data-admin', 0);
|
||||
parent.find('.delete-btn').removeClass('disabled');
|
||||
parent.attr('data-admin', 0);
|
||||
}
|
||||
else {
|
||||
bootbox.confirm('Do you really want to make "' + adminBtn.attr('data-username') +'" an admin?', function(confirm) {
|
||||
bootbox.confirm('Do you really want to make "' + parent.attr('data-username') +'" an admin?', function(confirm) {
|
||||
if(confirm) {
|
||||
socket.emit('api:admin.user.makeAdmin', uid);
|
||||
adminBtn.addClass('btn-success');
|
||||
adminBtn.attr('data-admin', 1);
|
||||
parent.find('.delete-btn').addClass('disabled');
|
||||
parent.attr('data-admin', 1);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
return false;
|
||||
});
|
||||
|
||||
jQuery('.delete-btn').on('click', function() {
|
||||
var deleteBtn = $(this);
|
||||
var isAdmin = isUserAdmin(deleteBtn);
|
||||
var parent = deleteBtn.parents('.users-box');
|
||||
var uid = getUID(deleteBtn);
|
||||
|
||||
if(!isAdmin) {
|
||||
bootbox.confirm('Do you really want to delete "' + parent.attr('data-username') +'"?', function(confirm) {
|
||||
socket.emit('api:admin.user.deleteUser', uid);
|
||||
});
|
||||
}
|
||||
|
||||
return false;
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
|
||||
@@ -35,5 +35,25 @@ var RDB = require('./../redis.js'),
|
||||
});
|
||||
};
|
||||
|
||||
UserAdmin.deleteUser = function(uid, theirid, socket) {
|
||||
user.isAdministrator(uid, function(amIAdmin) {
|
||||
user.isAdministrator(theirid, function(areTheyAdmin){
|
||||
if(amIAdmin && !areTheyAdmin) {
|
||||
user.delete(theirid, function(data) {
|
||||
|
||||
socket.emit('event:alert', {
|
||||
title: 'User Deleted',
|
||||
message: 'This user is deleted!',
|
||||
type: 'success',
|
||||
timeout: 2000
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
};
|
||||
|
||||
}(exports));
|
||||
|
||||
|
||||
@@ -40,8 +40,33 @@ var user = require('./../user.js'),
|
||||
case 'users' :
|
||||
if (req.params.tab == 'search') {
|
||||
res.json({search_display: 'block', users: []});
|
||||
} else {
|
||||
user.getUserList(function(data){
|
||||
}
|
||||
else if(req.params.tab == 'latest') {
|
||||
user.getUserList(function(data) {
|
||||
data = data.sort(function(a, b) {
|
||||
return b.joindate - a.joindate;
|
||||
});
|
||||
res.json({search_display: 'none', users:data, yourid:req.user.uid});
|
||||
});
|
||||
}
|
||||
else if(req.params.tab == 'sort-posts') {
|
||||
user.getUserList(function(data) {
|
||||
data = data.sort(function(a, b) {
|
||||
return b.postcount - a.postcount;
|
||||
});
|
||||
res.json({search_display: 'none', users:data, yourid:req.user.uid});
|
||||
});
|
||||
}
|
||||
else if(req.params.tab == 'sort-reputation') {
|
||||
user.getUserList(function(data) {
|
||||
data = data.sort(function(a, b) {
|
||||
return b.reputation - a.reputation;
|
||||
});
|
||||
res.json({search_display: 'none', users:data, yourid:req.user.uid});
|
||||
});
|
||||
}
|
||||
else {
|
||||
user.getUserList(function(data) {
|
||||
res.json({search_display: 'none', users:data, yourid:req.user.uid});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -425,6 +425,12 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
|
||||
admin.user.removeAdmin(uid, theirid, socket);
|
||||
}
|
||||
});
|
||||
|
||||
socket.on('api:admin.user.deleteUser', function(theirid) {
|
||||
if(uid && uid > 0) {
|
||||
admin.user.deleteUser(uid, theirid, socket);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
}(SocketIO));
|
||||
|
||||
Reference in New Issue
Block a user