From: Wolfgang Bumiller Date: Tue, 22 Sep 2015 11:45:43 +0000 (+0200) Subject: JSONSchema::generate_typetext: default_key support X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=commitdiff_plain;h=751ffbdd03b59f414c17f3d344c944eb89167f1f JSONSchema::generate_typetext: default_key support --- diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm index 0d68608..3afc37a 100644 --- a/src/PVE/JSONSchema.pm +++ b/src/PVE/JSONSchema.pm @@ -1357,13 +1357,17 @@ sub generate_typetext { my ($pre, $post) = ('', ''); my $add = sub { my ($key) = @_; - if (my $desc = $schema->{$key}->{format_description}) { - $typetext .= "$pre$key=<$desc>$post"; - } elsif (my $text = $schema->{$key}->{typetext}) { - $typetext .= "$pre$text$post"; + $typetext .= $pre; + my $entry = $schema->{$key}; + if (my $desc = $entry->{format_description}) { + $typetext .= $entry->{default_key} ? "[$key=]" : "$key="; + $typetext .= "<$desc>"; + } elsif (my $text = $entry->{typetext}) { + $typetext .= $text; } else { die "internal error: neither format_description nor typetext found"; } + $typetext .= $post; }; foreach my $key (@required) { &$add($key);