@@ -9763,9 +9765,9 @@
// Highlights the user being hovered
function userMouseHover2(element, over) {
var e = element.children[0].children[0];
- e.children[1].classList.remove('g1s');
- e.children[2].classList.remove('g2s');
- if (over == 1) { e.children[1].classList.add('g1s'); e.children[2].classList.add('g2s'); }
+ e.children[2].classList.remove('g1s');
+ e.children[3].classList.remove('g2s');
+ if (over == 1) { e.children[2].classList.add('g1s'); e.children[3].classList.add('g2s'); }
element.children[0].children[0].style['background-color'] = ((over == 0) ? '#c9c9c9' : '#b9b9b9');
}
@@ -10044,34 +10046,92 @@
if (usergroups) { for (var i in usergroups) { sortedGroups.push(usergroups[i]); } }
sortedGroups.sort(nameSort);
+ // Save the list of currently checked users
+ var checkedUserGroupids = [], elements = document.getElementsByClassName('UserGroupCheckbox');
+ for (var i=0;i';
QV('DuplicateUserGroupButton', false);
} else {
// Display the groups using the sorted list
x += '
';
- x += '
' + "Name" + '
' + "Device Groups" + '
' + "Users";
+ x += '
' + "Name" + '
' + "Devices" + '
' + "Device Groups" + '
' + "Users";
for (var i in sortedGroups) { x += addUserGroupHtml(sortedGroups[i]); }
x += '
';
QV('DuplicateUserGroupButton', true);
}
QH('p50groups', x);
+ // Re-check userid's
+ elements = document.getElementsByClassName('UserGroupCheckbox');
+ for (var i=0;i= 0)); }
+ p50updateInfo();
+
// Update current user panel if needed
if ((currentUserGroup != null) && (xxcurrentView == 51)) { gotoUserGroup(encodeURIComponent(currentUserGroup._id), true); }
}
function addUserGroupHtml(group) {
- var usercount = 0, meshcount = 0;
- if (group.links) { for (var i in group.links) { if (i.startsWith('user/')) { usercount++; } if (i.startsWith('mesh/')) { meshcount++; } } }
- var x = '
';
+ var usercount = 0, meshcount = 0, devicecount = 0;
+ if (group.links) { for (var i in group.links) { if (i.startsWith('user/')) { usercount++; } if (i.startsWith('mesh/')) { meshcount++; } if (i.startsWith('node/')) { devicecount++; } } }
+ var x = '
';
x += '
';
- x += '
';
- x += '';
- x += '
' + group.name + '
' + meshcount + '
' + usercount;
+ x += '';
+ x += '
';
+ x += '';
+ x += '
' + group.name + '
' + devicecount + '
' + meshcount + '
' + usercount;
return x;
}
+ function p50updateInfo() {
+ var elements = document.getElementsByClassName('UserGroupCheckbox'), checkcount = 0;
+ for (var i=0;i 0);
+ Q('UsersGroupsSelectAllButton').value = (checkcount > 0)?"Select None":"Select All";
+ }
+
+ // Called to select all or unselect all users
+ function p50usersSelectallButtonFunction() {
+ var eself = encodeURIComponent(userinfo._id);
+ var elements = document.getElementsByClassName('UserGroupCheckbox'), checkcount = 0;
+ for (var i=0;i ';
+ x += addHtmlValue("Operation", '');
+ setDialogMode(2, "Group Action", 3, p50usersGroupActionFunctionEx, x);
+ }
+
+ function p50usersGroupActionFunctionEx() {
+ var elements = document.getElementsByClassName('UserGroupCheckbox'), userids = [];
+ for (var i=0;i ';
+ x += '';
+ setDialogMode(2, "Delete User Groups", 3, p50groupActionFunctionDelExec, x);
+ QE('idx_dlgOkButton', false);
+ }
+ }
+
+ function p50usersGroupActionFunctionDelCheck() { QE('idx_dlgOkButton', Q('d3check').checked); }
+
+ // Delete a batch of user accounts
+ function p50groupActionFunctionDelExec(b) {
+ var elements = document.getElementsByClassName('UserGroupCheckbox');
+ for (var i=0;i ');
+ p10validateDeleteNodeDialog();
}
function p30showDeleteUserDialogEx() {