llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-09-10 02:32:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: fix function CheckAccountItemModifyRule (#1789)

Browse Source 
* feat: fix function CheckAccountItemModifyRule

* fix: admin changes its own username

* fix: current user changes its own username

* Update user.go

---------

Co-authored-by: hsluoyz <hsluoyz@qq.com>
This commit is contained in:
Yaodong Yu
2023-04-26 16:21:58 +08:00
committed by GitHub
parent 95f4f4cb6d
commit 6c2b172aae
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
controllers/base.go
View File

@@ -48,6 +48,9 @@ func (c *ApiController) IsGlobalAdmin() bool {
func (c *ApiController) IsAdmin() bool { func (c *ApiController) IsAdmin() bool {
isGlobalAdmin, user := c.isGlobalAdmin() isGlobalAdmin, user := c.isGlobalAdmin()
if user == nil {
return false
}
return isGlobalAdmin || user.IsAdmin return isGlobalAdmin || user.IsAdmin
} }

2
object/organization.go
View File

@@ -216,7 +216,7 @@ func CheckAccountItemModifyRule(accountItem *AccountItem, isAdmin bool, lang str
switch accountItem.ModifyRule { switch accountItem.ModifyRule {
case "Admin": case "Admin":
if isAdmin { if !isAdmin {
return false, fmt.Sprintf(i18n.Translate(lang, "organization:Only admin can modify the %s."), accountItem.Name) return false, fmt.Sprintf(i18n.Translate(lang, "organization:Only admin can modify the %s."), accountItem.Name)
} }
case "Immutable": case "Immutable":