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

bug fixes

Browse source
This commit is contained in:
JT Smith 2005-03-17 20:13:01 +00:00
parent c7c2c8d178
commit 736d341312
10 changed files with 148 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

30
lib/WebGUI/Asset.pm
View file

@ -480,7 +480,7 @@ sub duplicate {
my $self = shift;
my $assetToDuplicate = shift || $self;
my $newAsset = $self->addChild($assetToDuplicate->get);
my $sth = WebGUI::SQL->read("select * from metaData_values where assetId = ".quote($self->getId));
my $sth = WebGUI::SQL->read("select * from metaData_values where assetId = ".quote($assetToDuplicate->getId));
while( my $h = $sth->hashRef) {
WebGUI::SQL->write("insert into metaData_values (fieldId, assetId, value) values (".
quote($h->{fieldId}).",".quote($newAsset->getId).",".quote($h->{value}).")");
@ -1527,7 +1527,6 @@ Returns a toolbar with a set of icons that hyperlink to functions that delete, e
sub getToolbar {
my $self = shift;
return undef if ($self->{_toolbarOff});
my $toolbar = deleteIcon('func=delete',$self->get("url"),WebGUI::International::get(43,"Asset"))
.editIcon('func=edit',$self->get("url"))
.moveUpIcon('func=promote',$self->get("url"))
@ -1540,6 +1539,20 @@ sub getToolbar {
return '<img src="'.$self->getIcon(1).'" border="0" title="'.$self->getName.'" alt="'.$self->getName.'" align="absmiddle">'.$toolbar;
}
#-------------------------------------------------------------------
=head2 getToolbarState ( )
Returns 0 if the state is normal, and 1 if the toolbar state has been toggled. See toggleToolbar() for details.
=cut
sub getToolbarState {
my $self = shift;
return $self->{_toolbarState};
}
#-------------------------------------------------------------------
=head2 getUiLevel ( )
@ -1602,7 +1615,10 @@ sub getValue {
}
$self->{_propertyDefinitions} = \%properties;
}
return $session{form}{$key} || $self->get($key) || $self->{_propertyDefinitions}{$key}{defaultValue};
return $session{form}{$key} if (exists $session{form}{$key});
my $storedValue = $self->get($key);
return $storedValue if (defined $storedValue);
return $self->{_propertyDefinitions}{$key}{defaultValue};
}
return undef;
}
@ -2152,16 +2168,16 @@ sub trash {
=head2 toggleToolbar ( )
Toggles whether to render a toolbar in an asset. This is mostly useful for macros that wish to proxy an asset but not display the toolbar.
Toggles a toolbar to a special state so that custom toolbars can be rendered under special circumstances. This is mostly useful for macros that wish to proxy an asset but not display the toolbar.
=cut
sub toggleToolbar {
my $self = shift;
if ($self->{_toolbarOff}) {
$self->{_toolbarOff} = 0;
if ($self->{_toolbarState}) {
$self->{_toolbarState} = 0;
} else {
$self->{_toolbarOff} = 1;
$self->{_toolbarState} = 1;
}
}