fixed a couple minor things
This commit is contained in:
parent
59df4ab49e
commit
dcbcaee880
1 changed files with 8 additions and 8 deletions
|
|
@ -121,12 +121,12 @@ A boolean indicating whether to return just the field, or the field with a table
|
||||||
|
|
||||||
sub formField {
|
sub formField {
|
||||||
my $self = shift;
|
my $self = shift;
|
||||||
my $properties = shift;
|
my $properties = shift || {};
|
||||||
my $withWrapper = shift;
|
my $withWrapper = shift;
|
||||||
$properties->{label} = $self->getLabel;
|
$properties->{label} = $self->getLabel;
|
||||||
$properties->{fieldType} = $self->get("fieldType");
|
$properties->{fieldType} = $self->get("fieldType");
|
||||||
$properties->{name} = $self->getId;
|
$properties->{name} = $self->getId;
|
||||||
my $values = WebGUI::Operation::Shared::secureEval($self->get("possibleValues"));
|
my $values = WebGUI::Operation::Shared::secureEval($self->get("possibleValues")) || {};
|
||||||
my $orderedValues = {};
|
my $orderedValues = {};
|
||||||
tie %{$orderedValues}, 'Tie::IxHash';
|
tie %{$orderedValues}, 'Tie::IxHash';
|
||||||
foreach my $ov (sort keys %{$values}) {
|
foreach my $ov (sort keys %{$values}) {
|
||||||
|
|
@ -134,18 +134,18 @@ sub formField {
|
||||||
}
|
}
|
||||||
$properties->{options} = $orderedValues;
|
$properties->{options} = $orderedValues;
|
||||||
my $default;
|
my $default;
|
||||||
if ($session{form}{$properties->{fieldName}}) {
|
if ($session{form}{$properties->{name}}) {
|
||||||
$default = $session{form}{$properties->{fieldName}};
|
$default = $session{form}{$properties->{name}};
|
||||||
} elsif ($session{user}{$properties->{fieldName}}) {
|
} elsif ($session{user}{$properties->{name}}) {
|
||||||
$default = $session{user}{$properties->{fieldName}};
|
$default = $session{user}{$properties->{name}};
|
||||||
} else {
|
} else {
|
||||||
$default = WebGUI::Operation::Shared::secureEval($properties->{dataDefault});
|
$default = WebGUI::Operation::Shared::secureEval($properties->{dataDefault});
|
||||||
}
|
}
|
||||||
$properties->{value} = $default;
|
$properties->{value} = $default;
|
||||||
if ($withWrapper) {
|
if ($withWrapper) {
|
||||||
return WebGUI::Form::DynamicField->new($properties)->displayFormWithWrapper;
|
return WebGUI::Form::DynamicField->new(%{$properties})->displayFormWithWrapper;
|
||||||
} else {
|
} else {
|
||||||
return WebGUI::Form::DynamicField->new($properties)->displayForm;
|
return WebGUI::Form::DynamicField->new(%{$properties})->displayForm;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue