mirror of
https://github.com/yusing/godoxy.git
synced 2026-04-19 06:59:50 +02:00
refactor and fix homepage override not correctly loaded
This commit is contained in:
@@ -87,7 +87,6 @@ func (p *Provider) MarshalText() ([]byte, error) {
|
||||
}
|
||||
|
||||
func (p *Provider) startRoute(parent task.Parent, r *route.Route) gperr.Error {
|
||||
r.FinalizeHomepageConfig()
|
||||
err := r.Start(parent)
|
||||
if err != nil {
|
||||
delete(p.routes, r.Alias)
|
||||
@@ -157,7 +156,9 @@ func (p *Provider) loadRoutes() (routes route.Routes, err gperr.Error) {
|
||||
}
|
||||
if r.ShouldExclude() {
|
||||
delete(routes, alias)
|
||||
continue
|
||||
}
|
||||
r.FinalizeHomepageConfig()
|
||||
}
|
||||
return routes, errs.Error()
|
||||
}
|
||||
|
||||
@@ -369,15 +369,14 @@ func (r *Route) FinalizeHomepageConfig() {
|
||||
|
||||
isDocker := r.Container != nil
|
||||
|
||||
hp := r.Homepage
|
||||
if hp.IsEmpty() {
|
||||
hp = homepage.NewItem(r.Alias)
|
||||
if r.Homepage.IsEmpty() {
|
||||
r.Homepage = homepage.NewItem(r.Alias)
|
||||
}
|
||||
hp = hp.GetOverride()
|
||||
|
||||
hp := r.Homepage
|
||||
hp.Alias = r.Alias
|
||||
hp.Provider = r.Provider
|
||||
|
||||
r.Homepage = hp
|
||||
hp = hp.ApplyOverride()
|
||||
|
||||
var key string
|
||||
if hp.Name == "" {
|
||||
|
||||
Reference in New Issue
Block a user