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

feat: return most backend API errors to frontend (#1836)

Browse Source 
* feat: return most backend API errros to frontend

Signed-off-by: yehong <239859435@qq.com>

* refactor: reduce int type change

Signed-off-by: yehong <239859435@qq.com>

* feat: return err backend in token.go

Signed-off-by: yehong <239859435@qq.com>

---------

Signed-off-by: yehong <239859435@qq.com>
This commit is contained in:
yehong
2023-05-30 15:49:39 +08:00
committed by GitHub
parent 34151c0095
commit 02e692a300
105 changed files with 3788 additions and 1734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
object/role_upload.go
View File

@ -18,21 +18,29 @@ import (
"github.com/casdoor/casdoor/xlsx"
)
func getRoleMap(owner string) map[string]*Role {
func getRoleMap(owner string) (map[string]*Role, error) {
m := map[string]*Role{}
roles := GetRoles(owner)
roles, err := GetRoles(owner)
if err != nil {
return nil, err
}
for _, role := range roles {
m[role.GetId()] = role
}
return m
return m, nil
}
func UploadRoles(owner string, fileId string) bool {
func UploadRoles(owner string, fileId string) (bool, error) {
table := xlsx.ReadXlsxFile(fileId)
oldUserMap := getRoleMap(owner)
oldUserMap, err := getRoleMap(owner)
if err != nil {
return false, err
}
newRoles := []*Role{}
for index, line := range table {
if index == 0 || parseLineItem(&line, 0) == "" {
@ -57,7 +65,7 @@ func UploadRoles(owner string, fileId string) bool {
}
if len(newRoles) == 0 {
return false
return false, nil
}
return AddRolesInBatch(newRoles)
return AddRolesInBatch(newRoles), nil
}