llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-02 11:20:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: use org/groupName replace groupName (#2180)

Browse Source
This commit is contained in:
Yaodong Yu
2023-08-06 20:16:44 +08:00
committed by GitHub
parent f06a4990bd
commit 3220a04fa9
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
object/group.go
View File

@ -164,7 +164,7 @@ func DeleteGroup(group *Group) (bool, error) {
return false, errors.New("group has children group")
}
if count, err := GetGroupUserCount(group.Name, "", ""); err != nil {
if count, err := GetGroupUserCount(group.GetId(), "", ""); err != nil {
return false, err
} else if count > 0 {
return false, errors.New("group has users")
@ -214,7 +214,7 @@ func ConvertToTreeData(groups []*Group, parentId string) []*Group {
return treeData
}
func RemoveUserFromGroup(owner, name, groupName string) (bool, error) {
func RemoveUserFromGroup(owner, name, groupId string) (bool, error) {
user, err := getUser(owner, name)
if err != nil {
return false, err
@ -223,7 +223,7 @@ func RemoveUserFromGroup(owner, name, groupName string) (bool, error) {
return false, errors.New("user not exist")
}
user.Groups = util.DeleteVal(user.Groups, groupName)
user.Groups = util.DeleteVal(user.Groups, groupId)
affected, err := updateUser(user.GetId(), user, []string{"groups"})
if err != nil {
return false, err
@ -231,22 +231,22 @@ func RemoveUserFromGroup(owner, name, groupName string) (bool, error) {
return affected != 0, err
}
func GetGroupUserCount(groupName string, field, value string) (int64, error) {
func GetGroupUserCount(groupId string, field, value string) (int64, error) {
if field == "" && value == "" {
return ormer.Engine.Where(builder.Like{"`groups`", groupName}).
return ormer.Engine.Where(builder.Like{"`groups`", groupId}).
Count(&User{})
} else {
return ormer.Engine.Table("user").
Where(builder.Like{"`groups`", groupName}).
Where(builder.Like{"`groups`", groupId}).
And(fmt.Sprintf("user.%s LIKE ?", util.CamelToSnakeCase(field)), "%"+value+"%").
Count()
}
}
func GetPaginationGroupUsers(groupName string, offset, limit int, field, value, sortField, sortOrder string) ([]*User, error) {
func GetPaginationGroupUsers(groupId string, offset, limit int, field, value, sortField, sortOrder string) ([]*User, error) {
users := []*User{}
session := ormer.Engine.Table("user").
Where(builder.Like{"`groups`", groupName + "\""})
Where(builder.Like{"`groups`", groupId + "\""})
if offset != -1 && limit != -1 {
session.Limit(limit, offset)
@ -273,10 +273,10 @@ func GetPaginationGroupUsers(groupName string, offset, limit int, field, value,
return users, nil
}
func GetGroupUsers(groupName string) ([]*User, error) {
func GetGroupUsers(groupId string) ([]*User, error) {
users := []*User{}
err := ormer.Engine.Table("user").
Where(builder.Like{"`groups`", groupName + "\""}).
Where(builder.Like{"`groups`", groupId + "\""}).
Find(&users)
if err != nil {
return nil, err