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

Revert "Calls to set() and update() set attributes as well as "properties"."

Browse source 
This reverts commit 57fe0721ab.
This commit is contained in:
Scott Walters 2010-05-31 14:39:36 -04:00
parent c31fee588c
commit 483acbc382
2 changed files with 5 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/WebGUI/AssetVersioning.pm
View file

@ -126,8 +126,7 @@ sub addRevision {
$session->db->commit;
# current values, and the user set properties
# my %mergedProperties = (%{$self->get}, %{$properties}, (status => 'pending', revisedBy => $session->user->userId, tagId => $workingTag->getId), ); # XXX results in the setting of read-only properties and nothing else seems to be done with this other than just set them again
my %mergedProperties = ( %{$properties}, status => 'pending', revisedBy => $session->user->userId, tagId => $workingTag->getId, );
my %mergedProperties = (%{$self->get}, %{$properties}, (status => 'pending', revisedBy => $session->user->userId, tagId => $workingTag->getId), );
#Instantiate new revision and fill with real data
my $newVersion = WebGUI::Asset->newById($session, $self->getId, $now);

23
lib/WebGUI/Definition/Role/Object.pm
View file

@ -85,23 +85,13 @@ is not an attribute of the object, then it is silently ignored.
=cut
sub set {
my $self = shift;
my $properties = @_ % 2 ? shift : { @_ };
my %seen;
my @settable = grep { ! $seen{$_}++ } (
$self->getProperties, # $self->meta->get_all_property_list, # same as $self->getProperties
$self->getReadableAttributes,
);
for my $attribute ( @settable ) {
next unless exists $properties->{$attribute};
$self->$attribute( $properties->{$attribute} );
my @orderedProperties = $self->getProperties;
KEY: for my $property ( @orderedProperties ) {
next KEY unless exists $properties->{$property};
$self->$property($properties->{$property});
}
# ignore unknown properties
return 1;
}
@ -191,10 +181,5 @@ sub getProperties {
return $self->meta->get_all_property_list;
}
sub getReadableAttributes {
my $self = shift;
return map $_->name, grep $_->has_accessor || $_->has_writer, $self->meta->get_all_attributes;
}
1;