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: remove model in adapter page (#2161)

Browse Source
This commit is contained in:
Yaodong Yu
2023-07-29 23:42:08 +08:00
committed by GitHub
parent ea10f8e615
commit 026fb207b3
8 changed files with 53 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
object/model.go
View File

@ -31,6 +31,8 @@ type Model struct {
ModelText string `xorm:"mediumtext" json:"modelText"`
IsEnabled bool `json:"isEnabled"`
model.Model `xorm:"-" json:"-"`
}
func GetModelCount(owner, field, value string) (int64, error) {
@ -176,10 +178,14 @@ func HasRoleDefinition(m model.Model) bool {
return m["g"] != nil
}
func (m *Model) initModel() (model.Model, error) {
casbinModel, err := model.NewModelFromString(m.ModelText)
if err != nil {
return nil, err
func (m *Model) initModel() error {
if m.Model == nil {
casbinModel, err := model.NewModelFromString(m.ModelText)
if err != nil {
return err
}
m.Model = casbinModel
}
return casbinModel, nil
return nil
}