Skip to content

[SER-1784] [core] Update global admin check when updating group #5743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 20, 2024
Merged

[SER-1784] [core] Update global admin check when updating group #5743

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23580d3
[core] Update global admin check when updating group
widatama Aug 29, 2024
64ca65f
Merge branch 'master' into group-edit
widatama Nov 19, 2024
95275e6
Changelog
ArtursKadikis Nov 20, 2024
e1434a6
Merge branch 'master' into group-edit
ArtursKadikis Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions frontend/express/public/core/user-management/javascripts/countly.views.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,8 +949,20 @@
watch: {
'groups': function() {
if (this.groups.length > 0) {
// Remove global admin role if user is assigned to any group
this.$refs.userDrawer.editedObject.global_admin = false;
// Remove global admin role if the assigned groups does not have global admin access
var groupHasGlobalAdmin = false;

this.groups.forEach(function(grpId) {
var group = groupsModel.data().find(function(grp) {
return grpId === grp._id;
});

if (group && group.global_admin === true) {
groupHasGlobalAdmin = true;
}
});

this.$refs.userDrawer.editedObject.global_admin = groupHasGlobalAdmin;
}

if (this.groups.length === 0) {
Expand Down Expand Up @@ -1152,4 +1164,4 @@
countlyVue.container.registerData("user-management/edit-user-drawer", {
component: Drawer
});
})();
})();
Loading