admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: handle openpititx config

Browse Source 
Signed-off-by: LiHui <andrewli@yunify.com>
This commit is contained in:
LiHui
2021-03-11 17:10:06 +08:00
parent 01600081f6
commit 87c71ed2dd
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/apiserver/config/config.go
View File

@@ -200,11 +200,14 @@ func (conf *Config) ToMap() map[string]bool {
}
if name == "openpitrix" {
if conf.OpenPitrixOptions.IsEmpty() {
// openpitrix is always true
result[name] = true
if conf.OpenPitrixOptions == nil {
result["openpitrix.appstore"] = false
} else {
result["openpitrix.appstore"] = true
result["openpitrix.appstore"] = conf.OpenPitrixOptions.AppStoreConfIsEmpty()
}
continue
}
if c.Field(i).IsNil() {
@@ -240,10 +243,6 @@ func (conf *Config) stripEmptyOptions() {
conf.LdapOptions = nil
}
if conf.OpenPitrixOptions != nil && conf.OpenPitrixOptions.IsEmpty() {
conf.OpenPitrixOptions = nil
}
if conf.NetworkOptions != nil && conf.NetworkOptions.IsEmpty() {
conf.NetworkOptions = nil
}