From 2d8f2d778286bac395a698edf4c1b7523a657a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toma=C5=BE=20Jerman?= Date: Mon, 11 Oct 2021 13:48:49 +0200 Subject: [PATCH] Add missing page weight yaml unmarshal --- pkg/envoy/yaml/compose_page_unmarshal.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/envoy/yaml/compose_page_unmarshal.go b/pkg/envoy/yaml/compose_page_unmarshal.go index 624da8dcc..7e6a22760 100644 --- a/pkg/envoy/yaml/compose_page_unmarshal.go +++ b/pkg/envoy/yaml/compose_page_unmarshal.go @@ -12,7 +12,7 @@ import ( ) func (wset *composePageSet) UnmarshalYAML(n *yaml.Node) error { - wx := make(map[uint64]int) + wx := make(map[string]int) return y7s.Each(n, func(k, v *yaml.Node) (err error) { var ( @@ -41,9 +41,9 @@ func (wset *composePageSet) UnmarshalYAML(n *yaml.Node) error { } if wrap.res.Weight < 0 { - wrap.res.Weight = wx[wrap.res.SelfID] + wrap.res.Weight = wx[wrap.refParent] } - wx[wrap.res.SelfID]++ + wx[wrap.refParent]++ *wset = append(*wset, wrap) return @@ -88,6 +88,9 @@ func (wrap *composePage) UnmarshalYAML(n *yaml.Node) (err error) { case "parent", "selfid": return decodeRef(v, "page parent", &wrap.refParent) + case "weight", "order": + return y7s.DecodeScalar(v, "page weight", &wrap.res.Weight) + case "visible": return y7s.DecodeScalar(v, "page visible", &wrap.res.Visible)