mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-07 04:40:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2625 from owncloud/fix_json_omit

Browse Source
This commit is contained in:
Alex Unger
2021-10-15 07:58:41 +02:00
committed by GitHub
parent 43b624a0fe 9f2831634d
commit 2303ca308c
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/pkg/config/config.go
View File

@@ -43,8 +43,6 @@ type Asset struct {
// WebConfig defines the available web configuration for a dynamically rendered config.json.
type WebConfig struct {
Server string `json:"server,omitempty"`
ThemeServer string `json:"omit"` // only used to build Theme
ThemePath string `json:"omit"` // only used to build Theme
Theme string `json:"theme,omitempty"`
Version string `json:"version,omitempty"` // TODO what is version used for?
OpenIDConnect OIDC `json:"openIdConnect,omitempty"`
@@ -84,8 +82,10 @@ type ExternalAppConfig struct {
// Web defines the available web configuration.
type Web struct {
Path string
Config WebConfig
Path string
ThemeServer string // used to build Theme in WebConfig
ThemePath string // used to build Theme in WebConfig
Config WebConfig
}
// Config combines all available configuration parts.

8
web/pkg/flagset/flagset.go
View File

@@ -170,17 +170,17 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
},
&cli.StringFlag{
Name: "web-theme-server",
Value: flags.OverrideDefaultString(cfg.Web.Config.ThemeServer, "https://localhost:9200"),
Value: flags.OverrideDefaultString(cfg.Web.ThemeServer, "https://localhost:9200"),
Usage: "Theme server URL",
EnvVars: []string{"WEB_UI_THEME_SERVER", "OCIS_URL"}, // WEB_UI_THEME_SERVER takes precedence over OCIS_URL
Destination: &cfg.Web.Config.ThemeServer,
Destination: &cfg.Web.ThemeServer,
},
&cli.StringFlag{
Name: "web-config-theme",
Value: flags.OverrideDefaultString(cfg.Web.Config.ThemePath, "/themes/owncloud/theme.json"),
Value: flags.OverrideDefaultString(cfg.Web.ThemePath, "/themes/owncloud/theme.json"),
Usage: "Theme path on the theme server",
EnvVars: []string{"WEB_UI_THEME_PATH"},
Destination: &cfg.Web.Config.ThemePath,
Destination: &cfg.Web.ThemePath,
},
&cli.StringFlag{
Name: "web-config-version",

6
web/pkg/service/v0/service.go
View File

@@ -71,10 +71,10 @@ func (p Web) getPayload() (payload []byte, err error) {
}
// build theme url
if themeServer, err := url.Parse(p.config.Web.Config.ThemeServer); err == nil {
p.config.Web.Config.Theme = themeServer.String() + p.config.Web.Config.ThemePath
if themeServer, err := url.Parse(p.config.Web.ThemeServer); err == nil {
p.config.Web.Config.Theme = themeServer.String() + p.config.Web.ThemePath
} else {
p.config.Web.Config.Theme = p.config.Web.Config.ThemePath
p.config.Web.Config.Theme = p.config.Web.ThemePath
}
if p.config.Web.Config.ExternalApps == nil {