proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-07-16 18:53:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename variable

Browse Source 
to prevent confusion of rendered type text vs. original type
property

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2017-05-15 09:31:08 +02:00
parent fbb0ec640a
commit 77096a6fa4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/PVE/RESTHandler.pm
View File

@ -409,16 +409,16 @@ my $get_property_description = sub {
chomp $descr; chomp $descr;
my $type = PVE::JSONSchema::schema_get_type_text($phash, $style); my $type_text = PVE::JSONSchema::schema_get_type_text($phash, $style);
if ($hidepw && $name eq 'password') { if ($hidepw && $name eq 'password') {
$type = ''; $type_text = '';
} }
if ($fileparams && $phash->{type} eq 'string') { if ($fileparams && $phash->{type} eq 'string') {
foreach my $elem (@$fileparams) { foreach my $elem (@$fileparams) {
if ($name eq $elem) { if ($name eq $elem) {
$type = '<filepath>'; $type_text = '<filepath>';
last; last;
} }
} }
@ -438,7 +438,7 @@ my $get_property_description = sub {
die "unknown style '$style'"; die "unknown style '$style'";
} }
$res .= "`$type` " if $type; $res .= "`$type_text` " if $type_text;
if (defined(my $dv = $phash->{default})) { if (defined(my $dv = $phash->{default})) {
$res .= "('default =' `$dv`)"; $res .= "('default =' `$dv`)";
@ -480,7 +480,7 @@ my $get_property_description = sub {
die "unknown style '$style'"; die "unknown style '$style'";
} }
my $tmp = sprintf " %-10s %s$defaulttxt\n", $display_name, "$type"; my $tmp = sprintf " %-10s %s$defaulttxt\n", $display_name, "$type_text";
my $indend = " "; my $indend = " ";
$res .= Text::Wrap::wrap('', $indend, ($tmp)); $res .= Text::Wrap::wrap('', $indend, ($tmp));
@ -558,7 +558,7 @@ sub usage_str {
next if $arg_hash->{$k}; next if $arg_hash->{$k};
next if defined($fixed_param->{$k}); next if defined($fixed_param->{$k});
my $type = $prop->{$k}->{type} || 'string'; my $type_text = $prop->{$k}->{type} || 'string';
next if $hidepw && ($k eq 'password') && !$prop->{$k}->{optional}; next if $hidepw && ($k eq 'password') && !$prop->{$k}->{optional};
@ -578,7 +578,7 @@ sub usage_str {
if (!$prop->{$k}->{optional}) { if (!$prop->{$k}->{optional}) {
$args .= " " if $args; $args .= " " if $args;
$args .= "-$base <$type>" $args .= "-$base <$type_text>"
} }
} }