PVE::CLIHandler::print_api_list - allow to pass empty $props_to_print

This commit is contained in:
Dietmar Maurer 2018-06-22 07:12:42 +02:00
parent 340c98629c
commit eb04f1e26c

View File

@ -499,6 +499,14 @@ sub print_api_list {
my $returnprops = $returninfo->{items}->{properties}; my $returnprops = $returninfo->{items}->{properties};
if (!defined($props_to_print)) {
$props_to_print = [ sort keys %$returnprops ];
if (!scalar(@$props_to_print)) {
$props_to_print = [ sort keys %{$data->[0]} ];
}
die "unable to detect list properties\n" if !scalar(@$props_to_print);
}
my $formatopts = []; my $formatopts = [];
foreach my $prop ( @$props_to_print ) { foreach my $prop ( @$props_to_print ) {
my $propinfo = $returnprops->{$prop}; my $propinfo = $returnprops->{$prop};
@ -531,8 +539,7 @@ sub print_api_result {
return if !scalar(@$data); return if !scalar(@$data);
my $item_type = $result_schema->{items}->{type}; my $item_type = $result_schema->{items}->{type};
if ($item_type eq 'object') { if ($item_type eq 'object') {
my $prop_list = [ sort keys %{$result_schema->{items}->{properties}}]; print_api_list(undef, $data, $result_schema);
print_api_list($prop_list, $data, $result_schema);
} else { } else {
foreach my $entry (@$data) { foreach my $entry (@$data) {
print data_to_text($entry) . "\n"; print data_to_text($entry) . "\n";