mirror of
https://github.com/casdoor/casdoor.git
synced 2025-05-23 02:35:49 +08:00
fix: dropped object group errors (#2545)
This commit is contained in:
parent
08864686f3
commit
85b86e8831
@ -271,7 +271,9 @@ func GetGroupUsers(groupId string) ([]*User, error) {
|
|||||||
users := []*User{}
|
users := []*User{}
|
||||||
owner, _ := util.GetOwnerAndNameFromId(groupId)
|
owner, _ := util.GetOwnerAndNameFromId(groupId)
|
||||||
names, err := userEnforcer.GetUserNamesByGroupName(groupId)
|
names, err := userEnforcer.GetUserNamesByGroupName(groupId)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
err = ormer.Engine.Where("owner = ?", owner).In("name", names).Find(&users)
|
err = ormer.Engine.Where("owner = ?", owner).In("name", names).Find(&users)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -303,6 +305,9 @@ func GroupChangeTrigger(oldName, newName string) error {
|
|||||||
|
|
||||||
groups := []*Group{}
|
groups := []*Group{}
|
||||||
err = session.Where("parent_id = ?", oldName).Find(&groups)
|
err = session.Where("parent_id = ?", oldName).Find(&groups)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
for _, group := range groups {
|
for _, group := range groups {
|
||||||
group.ParentId = newName
|
group.ParentId = newName
|
||||||
_, err := session.ID(core.PK{group.Owner, group.Name}).Cols("parent_id").Update(group)
|
_, err := session.ID(core.PK{group.Owner, group.Name}).Cols("parent_id").Update(group)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user