From bee41fb75427b8ec225222d80147a8fdee8cb24c Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Thu, 6 Apr 2023 01:33:58 +0100 Subject: [PATCH] Fix generation of anchors for additional properties but objects defined under `additionalProperties` missed out on them. This fixes that. --- .../internal/newsfragments/1487.clarification | 1 + .../json-schema/resolve-additional-types.html | 17 ++++++----------- 2 files changed, 7 insertions(+), 11 deletions(-) create mode 100644 changelogs/internal/newsfragments/1487.clarification diff --git a/changelogs/internal/newsfragments/1487.clarification b/changelogs/internal/newsfragments/1487.clarification new file mode 100644 index 00000000..d54557d9 --- /dev/null +++ b/changelogs/internal/newsfragments/1487.clarification @@ -0,0 +1 @@ +Fix generation of anchors for additional properties diff --git a/layouts/partials/json-schema/resolve-additional-types.html b/layouts/partials/json-schema/resolve-additional-types.html index a93dc0ac..a8f25be4 100644 --- a/layouts/partials/json-schema/resolve-additional-types.html +++ b/layouts/partials/json-schema/resolve-additional-types.html @@ -43,17 +43,12 @@ */}} {{ if $this_object.additionalProperties }} {{ if reflect.IsMap $this_object.additionalProperties }} - {{ $additional_objects = $additional_objects | append (partial "clean-object" $this_object.additionalProperties) }} - - {{ range $key, $property := $this_object.additionalProperties.properties }} - {{ $additional_objects = partial "get-additional-objects" (dict - "this_object" $property - "additional_objects" $additional_objects - "anchor_base" $anchor_base - "name" (printf "%s.%s" $name $key) - ) }} - {{ end }} - + {{ $additional_objects = partial "get-additional-objects" (dict + "this_object" $this_object.additionalProperties + "additional_objects" $additional_objects + "anchor_base" $anchor_base + "name" (printf "%s.additional" $name) + ) }} {{ end }} {{ end }}