This commit is contained in:
Matthew Wilson 2005-12-07 17:11:30 +00:00
parent c6035f338a
commit 1bb6033539

View file

@ -117,24 +117,24 @@ Optionally pass in a list of properties to override the default properties of an
sub formField { sub formField {
my $self = shift; my $self = shift;
my $properties = shift; my $properties = 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}) {
$orderedValues->{$ov} = $values->{$ov}; $orderedValues->{$ov} = $values->{$ov};
} }
$properties->{options} = $orderedValues; $properties->{options} = $orderedValues;
my $default; my $default;
if ($session{form}{$data->{fieldName}}) { if ($session{form}{$properties->{fieldName}}) {
$default = $session{form}{$data->{fieldName}}; $default = $session{form}{$properties->{fieldName}};
} elsif ($session{user}{$data->{fieldName}}) { } elsif ($session{user}{$properties->{fieldName}}) {
$default = $session{user}{$data->{fieldName}}; $default = $session{user}{$properties->{fieldName}};
} else { } else {
$default = WebGUI::Operation::Shared::secureEval($data->{dataDefault}); $default = WebGUI::Operation::Shared::secureEval($properties->{dataDefault});
} }
$properties->{value} = $default; $properties->{value} = $default;
return WebGUI::Form::DynamicField->new($properties)->displayForm; return WebGUI::Form::DynamicField->new($properties)->displayForm;
} }