hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: #5272, allow changing user groups from manage users page

Browse Source
v1.18.x
Barış Soner Uşaklı 5 years ago
parent ff8dfa049d
commit 05c9fe2735
8 changed files with 213 additions and 176 deletions
Show Stats Download Patch File Download Diff File

2
public/language/en-GB/admin/manage/users.json
Unescape Escape View File

@ -15,6 +15,8 @@
"delete": "Delete User(s)",
"purge": "Delete User(s) and Content",
"download-csv": "Download CSV",
"manage-groups": "Manage Groups",
"add-group": "Add Group",
"invite": "Invite",
"new": "New User",

56
public/less/admin/manage/users.less
Unescape Escape View File

@ -1,57 +1,19 @@
.manage-users {
min-height: 500px;
#users-container {
border: 1px solid #eee;
padding: 0px 20px 20px;
.users-box {
display: inline-block;
margin-top: 20px;
text-align: center;
vertical-align: top;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
height: auto;
max-width: 145px;
min-width: 145px;
padding: 1rem;
img, .user-icon {
.user-icon-style(80px, 4rem);
}
a {
margin-bottom:5px;
font-size: 12px;
}
.user-image {
position: relative;
.labels {
position: absolute;
bottom: 0px;
width: 100%;
span {
.search {
.form-control {
width: 100%;
opacity: 0.9;
font-size: 10px;
display: block;
border-radius: 0;
}
}
}
}
}
.ui-selected {
background: lighten(@brand-success, 25%);
.page-admin-users {
.group-card {
margin: 2px;
padding: 2px;
}
.ui-selecting {
background: lighten(@brand-success, 40%);
}
.remove-group-icon {
margin-left: 5px;
}
}

62
public/src/admin/manage/users.js
Unescape Escape View File

@ -1,13 +1,12 @@
'use strict';
define('admin/manage/users', ['translator', 'benchpress'], function (translator, Benchpress) {
define('admin/manage/users', ['translator', 'benchpress', 'autocomplete'], function (translator, Benchpress, autocomplete) {
var Users = {};
Users.init = function () {
var navPills = $('.nav-pills li');
var pathname = window.location.pathname;
if (!navPills.find('a[href^="' + pathname + '"]').length) {
if (!navPills.find('a[href^="' + pathname + '"]').length || pathname === config.relative_path + '/admin/manage/users') {
pathname = config.relative_path + '/admin/manage/users/latest';
}
navPills.removeClass('active').find('a[href^="' + pathname + '"]').parent().addClass('active');
@ -59,11 +58,56 @@ define('admin/manage/users', ['translator', 'benchpress'], function (translator,
}
$('[component="user/select/all"]').on('click', function () {
if ($(this).is(':checked')) {
$('.users-table [component="user/select/single"]').prop('checked', true);
} else {
$('.users-table [component="user/select/single"]').prop('checked', false);
$('.users-table [component="user/select/single"]').prop('checked', $(this).is(':checked'));
});
$('.manage-groups').on('click', function () {
var uids = getSelectedUids();
if (!uids.length) {
app.alertError('[[error:no-users-selected]]');
return false;
}
socket.emit('admin.user.loadGroups', uids, function (err, data) {
if (err) {
return app.alertError(err);
}
Benchpress.parse('admin/partials/manage_user_groups', data, function (html) {
var modal = bootbox.dialog({
message: utils.escapeHTML(html),
title: '[[admin/manage/users:manage-groups]]',
onEscape: true,
});
modal.on('shown.bs.modal', function () {
autocomplete.group(modal.find('.group-search'), function (ev, ui) {
var uid = $(ev.target).attr('data-uid');
socket.emit('admin.groups.join', { uid: uid, groupName: ui.item.value }, function (err) {
if (err) {
return app.alertError(err);
}
ui.item.group.nameEscaped = translator.escape(ui.item.group.displayName);
app.parseAndTranslate('admin/partials/manage_user_groups', { users: [{ groups: [ui.item.group] }] }, function (html) {
$('[data-uid=' + uid + '] .group-area').append(html.find('.group-area').html());
});
});
});
});
modal.on('click', '.group-area a', function () {
modal.modal('hide');
});
modal.on('click', '.remove-group-icon', function () {
var groupCard = $(this).parents('[data-group-name]');
var groupName = groupCard.attr('data-group-name');
var uid = $(this).parents('[data-uid]').attr('data-uid');
socket.emit('admin.groups.leave', { uid: uid, groupName: groupName }, function (err) {
if (err) {
return app.alertError(err);
}
groupCard.remove();
});
return false;
});
});
});
});
$('.ban-user').on('click', function () {
@ -321,8 +365,8 @@ define('admin/manage/users', ['translator', 'benchpress'], function (translator,
Benchpress.parse('admin/manage/users', 'users', data, function (html) {
translator.translate(html, function (html) {
html = $(html);
$('.users-table tr').not(':first').remove();
$('.users-table tr').first().after(html);
$('.users-table tbody tr').remove();
$('.users-table tbody').append(html);
html.find('.timeago').timeago();
$('.fa-spinner').addClass('hidden');

13
public/src/modules/autocomplete.js
Unescape Escape View File

@ -55,7 +55,12 @@ define('autocomplete', function () {
app.loadJQueryUI(function () {
input.autocomplete({
delay: 200,
select: onselect,
open: function () {
$(this).autocomplete('widget').css('z-index', 100005);
},
select: function (event, ui) {
handleOnSelect(input, onselect, event, ui);
},
source: function (request, response) {
socket.emit('groups.search', {
query: request.term,
@ -63,16 +68,12 @@ define('autocomplete', function () {
if (err) {
return app.alertError(err.message);
}
if (results && results.length) {
var names = results.map(function (group) {
return group && {
label: group.name,
value: group.name,
group: {
name: group.name,
slug: group.slug,
},
group: group,
};
});
response(names);

2
src/groups/search.js
Unescape Escape View File

@ -13,7 +13,7 @@ module.exports = function (Groups) {
if (!options.hideEphemeralGroups) {
groupNames = Groups.ephemeralGroups.concat(groupNames);
}
groupNames = groupNames.filter(name => name.toLowerCase().includes(query) && name !== 'administrators' && !Groups.isPrivilegeGroup(name));
groupNames = groupNames.filter(name => name.toLowerCase().includes(query) && !Groups.isPrivilegeGroup(name));
groupNames = groupNames.slice(0, 100);
let groupsData;

15
src/socket.io/admin/user.js
Unescape Escape View File

@ -9,6 +9,7 @@ const user = require('../../user');
const events = require('../../events');
const meta = require('../../meta');
const plugins = require('../../plugins');
const translator = require('../../translator');
const User = module.exports;
@ -190,3 +191,17 @@ User.search = async function (socket, data) {
User.restartJobs = async function () {
user.startJobs();
};
User.loadGroups = async function (socket, uids) {
const [userData, groupData] = await Promise.all([
user.getUsersData(uids),
groups.getUserGroupsFromSet('groups:createtime', uids),
]);
userData.forEach((data, index) => {
data.groups = groupData[index].filter(group => !groups.isPrivilegeGroup(group.name));
data.groups.forEach((group) => {
group.nameEscaped = translator.escape(group.displayName);
});
});
return { users: userData };
};

46
src/views/admin/manage/users.tpl
Unescape Escape View File

@ -1,17 +1,20 @@
<div class="row manage-users">
<div class="col-lg-12">
<div class="panel panel-default">
<div class="panel-heading"><i class="fa fa-user"></i> [[admin/manage/users:users]]</div>
<div class="panel-body">
<div class="clearfix">
<div class="btn-group pull-right">
<form class="form-inline pull-right">
<button id="createUser" class="btn btn-primary">[[admin/manage/users:new]]</button>
<!-- IF inviteOnly -->
<button component="user/invite" class="btn btn-success"><i class="fa fa-users"></i> [[admin/manage/users:invite]]</button>
<!-- ENDIF inviteOnly -->
<a target="_blank" href="{config.relative_path}/api/admin/users/csv" class="btn btn-primary">[[admin/manage/users:download-csv]]</a>
<div class="btn-group">
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">[[admin/manage/users:edit]] <span class="caret"></span></button>
<ul class="dropdown-menu">
<ul class="dropdown-menu dropdown-menu-right">
<li><a href="#" class="validate-email"><i class="fa fa-fw fa-check"></i> [[admin/manage/users:validate-email]]</a></li>
<li><a href="#" class="send-validation-email"><i class="fa fa-fw fa-mail-forward"></i> [[admin/manage/users:send-validation-email]]</a></li>
<li><a href="#" class="password-reset-email"><i class="fa fa-fw fa-key"></i> [[admin/manage/users:password-reset-email]]</a></li>
<li><a href="#" class="force-password-reset"><i class="fa fa-fw fa-unlock-alt"></i> [[admin/manage/users:force-password-reset]]</a></li>
<li><a href="#" class="manage-groups"><i class="fa fa-fw fa-users"></i> [[admin/manage/users:manage-groups]]</a></li>
<li class="divider"></li>
<li><a href="#" class="ban-user"><i class="fa fa-fw fa-gavel"></i> [[admin/manage/users:ban]]</a></li>
<li><a href="#" class="ban-user-temporary"><i class="fa fa-fw fa-clock-o"></i>[[admin/manage/users:temp-ban]]</a></li>
@ -22,16 +25,9 @@
<li><a href="#" class="delete-user-and-content"><i class="fa fa-fw fa-trash-o"></i> [[admin/manage/users:purge]]</a></li>
</ul>
</div>
<a target="_blank" href="{config.relative_path}/api/admin/users/csv" class="btn btn-primary pull-right">[[admin/manage/users:download-csv]]</a>
<!-- IF inviteOnly -->
<button component="user/invite" class="btn btn-success pull-right"><i class="fa fa-users"></i> [[admin/manage/users:invite]]</button>
<!-- ENDIF inviteOnly -->
<button id="createUser" class="btn btn-primary pull-right">[[admin/manage/users:new]]</button>
</form>
</div>
<hr/>
<ul class="nav nav-pills">
<li><a href='{config.relative_path}/admin/manage/users/latest?resultsPerPage={resultsPerPage}'>[[admin/manage/users:pills.latest]]</a></li>
<li><a href='{config.relative_path}/admin/manage/users/not-validated?resultsPerPage={resultsPerPage}'>[[admin/manage/users:pills.unvalidated]]</a></li>
@ -54,22 +50,27 @@
</li>
</ul>
<br />
<div class="search {search_display}">
<form class="form-inline">
<div class="form-group">
<label>[[admin/manage/users:search.uid]]</label>
<input class="form-control" id="search-user-uid" data-search-type="uid" type="number" placeholder="[[admin/manage/users:search.uid-placeholder]]"/><br />
</div>
<div class="form-group">
<label>[[admin/manage/users:search.username]]</label>
<input class="form-control" id="search-user-name" data-search-type="username" type="text" placeholder="[[admin/manage/users:search.username-placeholder]]"/><br />
</div>
<div class="form-group">
<label>[[admin/manage/users:search.email]]</label>
<input class="form-control" id="search-user-email" data-search-type="email" type="text" placeholder="[[admin/manage/users:search.email-placeholder]]"/><br />
</div>
<div class="form-group">
<label>[[admin/manage/users:search.ip]]</label>
<input class="form-control" id="search-user-ip" data-search-type="ip" type="text" placeholder="[[admin/manage/users:search.ip-placeholder]]"/><br />
</div>
</form>
<i class="fa fa-spinner fa-spin hidden"></i>
<span id="user-notfound-notify" class="label label-danger hide">[[admin/manage/users:search.not-found]]</span><br/>
</div>
@ -85,7 +86,7 @@
<thead>
<tr>
<th><input component="user/select/all" type="checkbox"/></th>
<th>[[admin/manage/users:users.uid]]</th>
<th class="text-right">[[admin/manage/users:users.uid]]</th>
<th>[[admin/manage/users:users.username]]</th>
<th>[[admin/manage/users:users.email]]</th>
<th class="text-right">[[admin/manage/users:users.postcount]]</th>
@ -121,7 +122,6 @@
</div>
<!-- IMPORT partials/paginator.tpl -->
</div>
</div>
</div>
</div>

13
src/views/admin/partials/manage_user_groups.tpl
Unescape Escape View File

@ -0,0 +1,13 @@
<!-- BEGIN users -->
<div data-uid="{users.uid}">
<h5>{users.username}</h5>
<div class="group-area">
<!-- BEGIN users.groups -->
<div class="group-card pull-left" data-group-name="{users.groups.nameEscaped}">
<a href="{config.relative_path}/admin/manage/groups/{users.groups.nameEncoded}"><span class="label label-default" style="color:{users.groups.textColor}; background-color: {users.groups.labelColor};"><!-- IF users.groups.icon --><i class="fa {users.groups.icon}"></i> <!-- ENDIF users.groups.icon -->{users.groups.displayName} <i class="remove-group-icon fa fa-times" role="button"></i></span></a>
</div>
<!-- END users.groups -->
</div>
<input data-uid="{users.uid}" class="form-control group-search" placeholder="[[admin/manage/users:add-group]]" />
</div>
<!-- END users -->
Write Preview
Loading…
Cancel
Save