llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-03 12:30:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: fix potential bugs in init_data.go (#2932)

Browse Source 
* fix: fix potential bugs in init data

* fix: improve code format
This commit is contained in:
DacongDA
2024-05-07 23:11:08 +08:00
committed by GitHub
parent 572616d390
commit d24ddd4f1c
5 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
object/role.go
View File

@ -238,6 +238,15 @@ func AddRolesInBatch(roles []*Role) bool {
return affected
}
func deleteRole(role *Role) (bool, error) {
affected, err := ormer.Engine.ID(core.PK{role.Owner, role.Name}).Delete(&Role{})
if err != nil {
return false, err
}
return affected != 0, nil
}
func DeleteRole(role *Role) (bool, error) {
roleId := role.GetId()
permissions, err := GetPermissionsByRole(roleId)
@ -253,12 +262,7 @@ func DeleteRole(role *Role) (bool, error) {
}
}
affected, err := ormer.Engine.ID(core.PK{role.Owner, role.Name}).Delete(&Role{})
if err != nil {
return false, err
}
return affected != 0, nil
return deleteRole(role)
}
func (role *Role) GetId() string {