oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rolling back my alleged fix.

Browse source
This commit is contained in:
Matthew Wilson 2005-10-14 18:49:38 +00:00
parent e2dda3f6a3
commit 38b4753b5c
1 changed files with 10 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

37
lib/WebGUI/Asset.pm
View file

@ -42,7 +42,7 @@ use WebGUI::TabForm;
use WebGUI::URL;
use WebGUI::Utility;
our $propertyDefinitions;
our $definitionArrays;
=head1 NAME
@ -471,30 +471,6 @@ sub getDefault {
return $class->newByDynamicClass($session{setting}{defaultPage});
}
#-------------------------------------------------------------------
=head2 getDefaultValue ( )
Returns the defaultValue for the key for the className of the calling object instance.
=cut
sub getDefaultValue {
my $self = shift;
my $key = shift;
unless (exists $propertyDefinitions->{$self->getValue("className")}) { # check to see if the definitions have been merged and cached
my %properties;
foreach my $definition (@{$self->definition}) {
%properties = (%properties, %{$definition->{properties}});
}
our $propertyDefinitions;
$propertyDefinitions->{$self->getValue("className")} = \%properties;
}
return $propertyDefinitions->{$self->getValue("className")}->{$key}{defaultValue};
}
#-------------------------------------------------------------------
=head2 getEditForm ( )
@ -955,10 +931,17 @@ sub getValue {
my $self = shift;
my $key = shift;
if (defined $key) {
return $session{form}{$key} if (exists $session{form}{$key});
# return $session{form}{$key} if (exists $session{form}{$key}); # Security Hazard!
my $storedValue = $self->get($key);
return $storedValue if (defined $storedValue);
return $self->getDefaultValue($key);
unless (exists $self->{_propertyDefinitions}) { # check to see if the definitions have been merged and cached
my %properties;
foreach my $definition (@{$self->definition}) {
%properties = (%properties, %{$definition->{properties}});
}
$self->{_propertyDefinitions} = \%properties;
}
return $self->{_propertyDefinitions}{$key}{defaultValue};
}
return undef;
}