diff --git a/core/controllers/user.go b/core/controllers/user.go index a4fa90ef..70982840 100644 --- a/core/controllers/user.go +++ b/core/controllers/user.go @@ -71,7 +71,7 @@ func GetUserList(c *gin.Context) { } if role, ok := rolesMap[user.RoleId]; ok { users[i].Role = role.Name - users[i].IsAdmin = role.Admin + users[i].RootAdminRole = role.RootAdmin } } } @@ -270,7 +270,7 @@ func getUserById(userId primitive.ObjectID, c *gin.Context) { return } user.Role = role.Name - user.IsAdmin = role.Admin + user.RootAdminRole = role.RootAdmin } } diff --git a/core/models/models/role.go b/core/models/models/role.go index 898d64a6..2a132f69 100644 --- a/core/models/models/role.go +++ b/core/models/models/role.go @@ -6,7 +6,7 @@ type Role struct { Name string `json:"name" bson:"name"` Description string `json:"description" bson:"description"` Routes []string `json:"routes" bson:"routes"` - Admin bool `json:"-" bson:"admin,omitempty"` - IsAdmin bool `json:"admin" bson:"-"` + RootAdmin bool `json:"-" bson:"root_admin,omitempty"` + IsRootAdmin bool `json:"root_admin" bson:"-"` Users int `json:"users" bson:"-"` } diff --git a/core/models/models/user.go b/core/models/models/user.go index 356562c4..c96bcf6e 100644 --- a/core/models/models/user.go +++ b/core/models/models/user.go @@ -13,6 +13,6 @@ type User struct { LastName string `json:"last_name" bson:"last_name"` Email string `json:"email" bson:"email"` RootAdmin bool `json:"root_admin,omitempty" bson:"root_admin"` - IsAdmin bool `json:"admin,omitempty" bson:"-"` + RootAdminRole bool `json:"root_admin_role,omitempty" bson:"-"` Routes []string `json:"routes,omitempty" bson:"-"` }