Merge branch 'master' into crash-app-version

Author: Cookiezaurs

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## Version 24.05.XX
 Fixes:
 - [script] Fixing bug with "delete_old_members" script that led to malformed requests
+- [core] Fixed bug where changing passwords results in the loss of the "Global Admin" role
 
 ## Version 24.05.17
 Fixes:

frontend/express/public/core/user-management/javascripts/countly.views.js

@@ -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) {
@@ -1152,4 +1164,4 @@
     countlyVue.container.registerData("user-management/edit-user-drawer", {
         component: Drawer
     });
-})();
+})();