proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-08-15 04:02:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cli: print_text_table: correctly handle sort_key 0

Browse Source
This commit is contained in:
Dietmar Maurer 2018-07-25 14:55:30 +02:00
parent 9da2722861
commit 2e2a450272
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/PVE/CLIFormatter.pm
View File

@ -132,7 +132,7 @@ sub data_to_text {
# $returnprops -json schema property description # $returnprops -json schema property description
# $props_to_print - ordered list of properties to print # $props_to_print - ordered list of properties to print
# $options # $options
# - sort_key: can be used to sort after a column, if it isn't set we sort # - sort_key: can be used to sort after a specific column, if it isn't set we sort
# after the leftmost column (with no undef value in $data) this can be # after the leftmost column (with no undef value in $data) this can be
# turned off by passing 0 as sort_key # turned off by passing 0 as sort_key
# - noborder: print without asciiart border # - noborder: print without asciiart border
@ -150,11 +150,9 @@ sub print_text_table {
my $utf8 = $options->{utf8}; my $utf8 = $options->{utf8};
my $encoding = $options->{encoding} // 'UTF-8'; my $encoding = $options->{encoding} // 'UTF-8';
if (!defined($sort_key) || $sort_key eq 0) { $sort_key //= $props_to_print->[0];
$sort_key = $props_to_print->[0];
}
if (defined($sort_key)) { if (defined($sort_key) && $sort_key ne 0) {
my $type = $returnprops->{$sort_key}->{type} // 'string'; my $type = $returnprops->{$sort_key}->{type} // 'string';
if ($type eq 'integer' || $type eq 'number') { if ($type eq 'integer' || $type eq 'number') {
@$data = sort { $a->{$sort_key} <=> $b->{$sort_key} } @$data; @$data = sort { $a->{$sort_key} <=> $b->{$sort_key} } @$data;