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

[ 1215228 ] getToolbar uses get("url") instead of getUrl

Browse source
This commit is contained in:
Matthew Wilson 2005-06-05 16:53:50 +00:00
parent 5c2ce93a86
commit 6b662543dd
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/changelog/6.x.x.txt
View file

@ -1,4 +1,4 @@
6.6.2
6.6.2
- fix [ 1210493 ] mistypo in query in thread.pm in table name
- Fixed a bug in the ITransact plugin that did not handle months with 31 days.
- fix [ 1200782 ] user.isModerator don't work
@ -7,6 +7,8 @@
- fix [ 1213516 ] Survey.pm: question order=response driven doesn't work
(Thanks to misja1)
- fix [ 1212596 ] Field disableContentLock is missing in Shortcut table
- fix [ 1215228 ] getToolbar uses get("url") instead of getUrl
6.6.1
- Replaced defective confirm checkout commerce template.

18
lib/WebGUI/Asset.pm
View file

@ -1656,11 +1656,11 @@ Returns a toolbar with a set of icons that hyperlink to functions that delete, e
sub getToolbar {
my $self = shift;
my $toolbar = deleteIcon('func=delete',$self->get("url"),WebGUI::International::get(43,"Asset"))
.editIcon('func=edit',$self->get("url"))
.cutIcon('func=cut',$self->get("url"))
.copyIcon('func=copy',$self->get("url"));
$toolbar .= shortcutIcon('func=createShortcut',$self->get("url")) unless ($self->get("className") =~ /Shortcut/);
my $toolbar = deleteIcon('func=delete',$self->getUrl,WebGUI::International::get(43,"Asset"))
.editIcon('func=edit',$self->getUrl)
.cutIcon('func=cut',$self->getUrl)
.copyIcon('func=copy',$self->getUrl);
$toolbar .= shortcutIcon('func=createShortcut',$self->getUrl) unless ($self->get("className") =~ /Shortcut/);
WebGUI::Style::setLink($session{config}{extrasURL}.'/contextMenu/contextMenu.css', {rel=>"stylesheet",type=>"text/css"});
WebGUI::Style::setScript($session{config}{extrasURL}.'/contextMenu/contextMenu.js', {type=>"text/javascript"});
#return '<img src="'.$self->getIcon(1).'" border="0" title="'.$self->getName.'" alt="'.$self->getName.'" align="absmiddle">'.$toolbar;
@ -3197,21 +3197,21 @@ sub www_manageAssets {
foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets","assetContainers")}) {
$output .= '<img src="'.$link->{'icon.small'}.'" align="middle" alt="'.$link->{label}.'" border="0" />
<a href="'.$link->{url}.'">'.$link->{label}.'</a> ';
$output .= editIcon("func=edit&proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype});
$output .= editIcon("func=edit&proceed=manageAssets",$link->{asset}->getUrl) if ($link->{isPrototype});
$output .= '<br />';
}
$output .= '<hr />';
foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets")}) {
$output .= '<img src="'.$link->{'icon.small'}.'" align="middle" alt="'.$link->{label}.'" border="0" />
<a href="'.$link->{url}.'">'.$link->{label}.'</a> ';
$output .= editIcon("func=edit&proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype});
$output .= editIcon("func=edit&proceed=manageAssets",$link->{asset}->getUrl) if ($link->{isPrototype});
$output .= '<br />';
}
$output .= '<hr />';
foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets","utilityAssets")}) {
$output .= '<img src="'.$link->{'icon.small'}.'" align="middle" alt="'.$link->{label}.'" border="0" />
<a href="'.$link->{url}.'">'.$link->{label}.'</a> ';
$output .= editIcon("func=edit&proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype});
$output .= editIcon("func=edit&proceed=manageAssets",$link->{asset}->getUrl) if ($link->{isPrototype});
$output .= '<br />';
}
$output .= '</fieldset></div>';
@ -3249,7 +3249,7 @@ sub www_manageAssets {
my $asset = WebGUI::Asset->newByDynamicClass($item->{assetId},$item->{className});
$packages .= '<img src="'.$asset->getIcon(1).'" align="middle" alt="'.$asset->getName.'" border="0" />
<a href="'.$self->getUrl("func=deployPackage&assetId=".$item->{assetId}).'">'.$item->{title}.'</a> '
.editIcon("func=edit&proceed=manageAssets",$asset->get("url"))
.editIcon("func=edit&proceed=manageAssets",$asset->getUrl)
.'<br />';
$hasPackages = 1;
}