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

fix: dont allow adding duplicates to privileges page

Browse Source 
hightlight uid/group if it is added again from autocomplete
This commit is contained in:
Barış Soner Uşaklı
2020-10-08 18:32:36 -04:00
parent f259063f08
commit 12c8b1c2bc
2 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@
100% {background-color: white;}
}
[data-group-name].selected {
[data-group-name].selected, [data-uid].selected {
animation-name: fadeOut;
animation-duration: 5s;
animation-fill-mode: both;

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

@@ -147,7 +147,7 @@ define('admin/manage/privileges', [
$('.privilege-table-container').html(html);
Privileges.exposeAssumedPrivileges();
hightlightRowByGroupName(groupToHighlight);
hightlightRowByDataAttr('data-group-name', groupToHighlight);
});
});
});
@@ -215,29 +215,7 @@ define('admin/manage/privileges', [
inputEl.focus();
autocomplete.user(inputEl, function (ev, ui) {
// Generate data for new row
var privilegeSet = ajaxify.data.privileges.keys.users.reduce(function (memo, cur) {
memo[cur] = false;
return memo;
}, {});
app.parseAndTranslate('admin/partials/privileges/' + (isNaN(cid) ? 'global' : 'category'), 'privileges.users', {
privileges: {
users: [
{
picture: ui.item.user.picture,
username: ui.item.user.username,
uid: ui.item.user.uid,
'icon:text': ui.item.user['icon:text'],
'icon:bgColor': ui.item.user['icon:bgColor'],
privileges: privilegeSet,
},
],
},
}, function (html) {
var tableEl = document.querySelectorAll('.privilege-table');
var rows = tableEl[1].querySelectorAll('tbody tr');
html.insertBefore(rows[rows.length - 1]);
addUserToCategory(ui.item.user, function () {
modal.modal('hide');
});
});
@@ -298,11 +276,12 @@ define('admin/manage/privileges', [
});
};
function hightlightRowByGroupName(groupName) {
if (groupName) {
var el = $('[data-group-name]').filter(function () {
return $(this).attr('data-group-name') === groupName;
function hightlightRowByDataAttr(attrName, attrValue) {
if (attrValue) {
var el = $('[' + attrName + ']').filter(function () {
return $(this).attr(attrName) === String(attrValue);
});
if (el.length) {
el.addClass('selected');
return true;
@@ -313,7 +292,7 @@ define('admin/manage/privileges', [
function highlightRow() {
if (ajaxify.data.group) {
if (hightlightRowByGroupName(ajaxify.data.group)) {
if (hightlightRowByDataAttr('data-group-name', ajaxify.data.group)) {
return;
}
addGroupToCategory(ajaxify.data.group);
@@ -321,6 +300,12 @@ define('admin/manage/privileges', [
}
function addGroupToCategory(group, cb) {
cb = cb || function () {};
var groupRow = document.querySelector('.privilege-table [data-group-name="' + group + '"]');
if (groupRow) {
hightlightRowByDataAttr('data-group-name', group);
return cb();
}
// Generate data for new row
var privilegeSet = ajaxify.data.privileges.keys.groups.reduce(function (memo, cur) {
memo[cur] = false;
@@ -342,10 +327,43 @@ define('admin/manage/privileges', [
var rows = tableEl.querySelectorAll('tbody tr');
html.insertBefore(rows[rows.length - 1]);
Privileges.exposeAssumedPrivileges();
hightlightRowByDataAttr('data-group-name', group);
cb();
});
}
if (typeof cb === 'function') {
cb();
}
function addUserToCategory(user, cb) {
cb = cb || function () {};
var userRow = document.querySelector('.privilege-table [data-uid="' + user.uid + '"]');
if (userRow) {
hightlightRowByDataAttr('data-uid', user.uid);
return cb();
}
// Generate data for new row
var privilegeSet = ajaxify.data.privileges.keys.users.reduce(function (memo, cur) {
memo[cur] = false;
return memo;
}, {});
app.parseAndTranslate('admin/partials/privileges/' + (isNaN(cid) ? 'global' : 'category'), 'privileges.users', {
privileges: {
users: [
{
picture: user.picture,
username: user.username,
uid: user.uid,
'icon:text': user['icon:text'],
'icon:bgColor': user['icon:bgColor'],
privileges: privilegeSet,
},
],
},
}, function (html) {
var tableEl = document.querySelectorAll('.privilege-table');
var rows = tableEl[1].querySelectorAll('tbody tr');
html.insertBefore(rows[rows.length - 1]);
hightlightRowByDataAttr('data-uid', user.uid);
cb();
});
}