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

feat: highlight privs row if group is added / navigating from group page

Browse Source
This commit is contained in:
psychobunny
2020-07-23 18:34:07 -04:00
parent 53f6139b8c
commit 10e4ae629c
3 changed files with 61 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/less/admin/manage/privileges.less
View File

@@ -5,3 +5,17 @@
overflow-x: hidden;
}
}
.page-admin-privileges {
@keyframes fadeOut {
0% {background-color: @brand-primary;}
100% {background-color: white;}
}
[data-group-name].selected {
animation-name: fadeOut;
animation-duration: 5s;
animation-fill-mode: both;
animation-timing-function: ease-out;
}
}

2
public/src/admin/manage/group.js
View File

@@ -93,7 +93,7 @@ define('admin/manage/group', [
var cid = $(this).attr('data-cid');
if (cid) {
var url = 'admin/manage/privileges/' + cid;
var url = 'admin/manage/privileges/' + cid + '?group=' + ajaxify.data.group.name;
if (app.flags && app.flags._unsaved === true) {
translator.translate('[[global:unsaved-changes]]', function (text) {
bootbox.confirm(text, function (navigate) {

64
public/src/admin/manage/privileges.js
View File

@@ -21,6 +21,8 @@ define('admin/manage/privileges', [
});
Privileges.setupPrivilegeTable();
highlightRow();
};
Privileges.setupPrivilegeTable = function () {
@@ -79,7 +81,7 @@ define('admin/manage/privileges', [
Privileges.exposeAssumedPrivileges();
};
Privileges.refreshPrivilegeTable = function () {
Privileges.refreshPrivilegeTable = function (groupToHighlight) {
socket.emit('admin.categories.getPrivilegeSettings', cid, function (err, privileges) {
if (err) {
return app.alertError(err.message);
@@ -92,6 +94,10 @@ define('admin/manage/privileges', [
translator.translate(html, function (html) {
$('.privilege-table-container').html(html);
Privileges.exposeAssumedPrivileges();
if (groupToHighlight) {
$('[data-group-name="' + groupToHighlight + '"]').addClass('selected');
}
});
});
});
@@ -182,24 +188,7 @@ define('admin/manage/privileges', [
inputEl.focus();
autocomplete.group(inputEl, function (ev, ui) {
var defaultPrivileges;
if (ajaxify.data.url === '/admin/manage/privileges/admin') {
defaultPrivileges = ['groups:admin:dashboard'];
} else {
defaultPrivileges = cid ? ['groups:find', 'groups:read', 'groups:topics:read'] : ['groups:chat'];
}
socket.emit('admin.categories.setPrivilege', {
cid: isNaN(cid) ? 0 : cid,
privilege: defaultPrivileges,
set: true,
member: ui.item.group.name,
}, function (err) {
if (err) {
return app.alertError(err.message);
}
Privileges.refreshPrivilegeTable();
addGroupToCategory(ui.item.group.name, function () {
modal.modal('hide');
});
});
@@ -235,5 +224,42 @@ define('admin/manage/privileges', [
});
};
function highlightRow() {
var params = utils.params();
if (params.group) {
var el = $('[data-group-name="' + params.group + '"]');
if (el.length) {
return el.addClass('selected');
}
addGroupToCategory(params.group);
}
}
function addGroupToCategory(group, cb) {
var defaultPrivileges;
if (ajaxify.data.url === '/admin/manage/privileges/admin') {
defaultPrivileges = ['groups:admin:dashboard'];
} else {
defaultPrivileges = cid ? ['groups:find', 'groups:read', 'groups:topics:read'] : ['groups:chat'];
}
socket.emit('admin.categories.setPrivilege', {
cid: isNaN(cid) ? 0 : cid,
privilege: defaultPrivileges,
set: true,
member: group,
}, function (err) {
if (err) {
return app.alertError(err.message);
}
Privileges.refreshPrivilegeTable(group);
if (typeof cb === 'function') {
cb();
}
});
}
return Privileges;
});