git-sync/crawlab
1
0
Fork 0
mirror of https://github.com/crawlab-team/crawlab.git synced 2026-01-21 17:21:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: optimized field names

Browse Source
This commit is contained in:
Marvin Zhang
2024-11-14 11:22:37 +08:00
parent c6ca5cb2a9
commit 4fd1ff8fcf
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/controllers/user.go
View File

@@ -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
}
}

4
core/models/models/role.go
View File

@@ -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:"-"`
}

2
core/models/models/user.go
View File

@@ -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:"-"`
}