diff options
Diffstat (limited to 'model/config.go')
| -rw-r--r-- | model/config.go | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/model/config.go b/model/config.go index 60a6d1983..525fc71ed 100644 --- a/model/config.go +++ b/model/config.go @@ -1681,12 +1681,8 @@ func (o *Config) Clone() *Config { } func (o *Config) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func (o *Config) GetSSOService(service string) *SSOSettings { @@ -1703,14 +1699,9 @@ func (o *Config) GetSSOService(service string) *SSOSettings { } func ConfigFromJson(data io.Reader) *Config { - decoder := json.NewDecoder(data) - var o Config - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *Config + json.NewDecoder(data).Decode(&o) + return o } func (o *Config) SetDefaults() { |