User groups improvements.
Ylian Saint-Hilaire committed
Jan 2, 2020 at 17:45 UTC
4a12043602f8f8500982634d5ea9df147dd55bc9
2 files changed
+27
-9
meshuser.js
+13
-1
@@ -1476,12 +1476,24 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
1476
}
1477
case 'usergroups':
1478
{
1479
- if ((user.siteadmin & SITERIGHT_USERGROUPS) == 0) { return; }
1479
+ // TODO: Return only groups in the same administrative domain?
1480
+ if ((user.siteadmin & SITERIGHT_USERGROUPS) == 0) {
1481
+ // We are not user group administrator, return a list with limited data.
1482
+ var groups = {}, groupCount = 0;
1483
+ for (var i in parent.userGroups) { groupCount++; groups[i] = { name: parent.userGroups[i].name }; }
1484
+ try { ws.send(JSON.stringify({ action: 'usergroups', ugroups: groupCount?groups:null, tag: command.tag })); } catch (ex) { }
1485
+ } else {
1486
+ // We are user group administrator, return a full user group list.
1487
+ try { ws.send(JSON.stringify({ action: 'usergroups', ugroups: parent.userGroups, tag: command.tag })); } catch (ex) { }
1488
+ }
1489
1490
+ /*
1491
// Request a list of all user groups this user as rights to
1492
+ if ((user.siteadmin & SITERIGHT_USERGROUPS) == 0) { return; }
1493
db.GetAllTypeNoTypeField('ugrp', domain.id, function (err, docs) {
1494
try { ws.send(JSON.stringify({ action: 'usergroups', ugroups: common.unEscapeAllLinksFieldName(docs), tag: command.tag })); } catch (ex) { }
1495
});
1496
+ */
1497
break;
1498
}
1499
case 'createusergroup':
views/default.handlebars
+14
-8
@@ -1723,9 +1723,15 @@
1723
}
1724
case 'usergroups': {
1725
var groupCount = 0;
1726
- usergroups = {};
1727
- for (var i in message.ugroups) { groupCount++; usergroups[message.ugroups[i]._id] = message.ugroups[i]; }
1728
- if (groupCount == 0) { usergroups = null; }
1726
+ if (Array.isArray(message.ugroups)) {
1727
+ usergroups = {};
1728
+ for (var i in message.ugroups) { groupCount++; usergroups[message.ugroups[i]._id] = message.ugroups[i]; }
1729
+ if (groupCount == 0) { usergroups = null; }
1730
+ } else {
1731
+ usergroups = message.ugroups;
1732
+ for (var i in message.ugroups) { groupCount++; }
1733
+ if (groupCount == 0) { usergroups = null; }
1734
+ }
1735
masterUpdate(8192);
1736
break;
1737
}
@@ -2249,7 +2255,7 @@
2255
// A new mesh was created
2256
if ((meshes[message.event.meshid] == null) && (message.event.links[userinfo._id] != null)) { // Check if this is a mesh create for a mesh we own. If site administrator, we get all messages so need to ignore some.
2257
meshes[message.event.meshid] = { _id: message.event.meshid, name: message.event.name, mtype: message.event.mtype, desc: message.event.desc, links: message.event.links };
2252
- masterUpdate(4 + 128);
2258
+ masterUpdate(4 + 128 + 8192 + 16384);
2259
meshserver.send({ action: 'files' });
2260
}
2261
break;
@@ -2286,7 +2292,7 @@
2292
if (xxcurrentView >= 10 && xxcurrentView < 20 && currentNode && currentNode.meshid == message.event.meshid) { setDialogMode(0); go(1); }
2293
}
2294
}
2289
- masterUpdate(4 + 128);
2295
+ masterUpdate(4 + 128 + 8192 + 16384);
2296
if (currentNode && (currentNode.meshid == message.event.meshid)) { currentNode = null; if ((xxcurrentView >= 10) && (xxcurrentView < 20)) { go(1); } }
2297
//meshserver.send({ action: 'files' }); // TODO: Why do we need to do this??
2298
@@ -2306,7 +2312,7 @@
2312
var newnodes = [];
2313
if (nodes != null) { for (var i in nodes) { if (nodes[i].meshid != message.event.meshid) { newnodes.push(nodes[i]); } } }
2314
nodes = newnodes;
2309
- masterUpdate(4);
2315
+ masterUpdate(4 + 8192 + 16384);
2316
2317
// If we are looking at a mesh that is now deleted, move back to "My Account"
2318
if (xxcurrentView >= 20 && xxcurrentView < 30 && currentMesh._id == message.event.meshid) { setDialogMode(0); go(2); }
@@ -7660,7 +7666,7 @@
7666
x += '<br style=clear:both><br>';
7667
if (meshrights & 2) {
7668
x += '<a href=# onclick="return p20showAddMeshUserDialog()" style=cursor:pointer;margin-right:10px><img src=images/icon-addnew.png border=0 height=12 width=12> ' + "Add Users" + '</a>';
7663
- if ((usergroups != null) && ((userinfo.siteadmin & 256) != 0)) {
7669
+ if (usergroups != null) {
7670
var userGroupCount = 0, newUserGroup = false;
7671
for (var i in usergroups) { userGroupCount++; if ((currentMesh.links == null) || (currentMesh.links[i] == null)) { newUserGroup = true; } }
7672
if ((userGroupCount > 0) && (newUserGroup)) { x += '<a href=# onclick="return p20showAddMeshUserDialog(2)" style=cursor:pointer;margin-right:10px><img src=images/icon-addnew.png border=0 height=12 width=12> ' + "Add User Group" + '</a>'; }
@@ -7898,7 +7904,7 @@
7904
for (var i in meshes) { if ((currentUser.links == null) || (currentUser.links[i] == null)) { y += '<option value=' + encodeURIComponent(i) + '>' + EscapeHtml(meshes[i].name) + '</option>'; } }
7905
x += addHtmlValue("Device Group", '<div style=width:230px;margin:0;padding:0><select onchange=p20validateAddMeshUserDialog() id=dp2groupid style=width:100%>' + y + '</select></div>');
7906
} else if (userid === 2) {
7901
- if ((usergroups == null) || ((userinfo.siteadmin & 256) == 0)) return;
7907
+ if (usergroups == null) return;
7908
var y = '';
7909
for (var i in usergroups) { if ((currentMesh.links == null) || (currentMesh.links[i] == null)) { y += '<option value=' + encodeURIComponent(i) + '>' + EscapeHtml(usergroups[i].name) + '</option>'; } }
7910
x += addHtmlValue("User Group", '<div style=width:230px;margin:0;padding:0><select onchange=p20validateAddMeshUserDialog() id=dp2groupid style=width:100%>' + y + '</select></div>');