diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 1bd65598a..069b7feec 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -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. diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index ecdb2e487..b486c8fb7 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -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 ''.$self->getName.''.$toolbar; @@ -3197,21 +3197,21 @@ sub www_manageAssets { foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets","assetContainers")}) { $output .= ''.$link->{label}.' '.$link->{label}.' '; - $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 .= '
'; } $output .= '
'; foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets")}) { $output .= ''.$link->{label}.' '.$link->{label}.' '; - $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 .= '
'; } $output .= '
'; foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets","utilityAssets")}) { $output .= ''.$link->{label}.' '.$link->{label}.' '; - $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 .= '
'; } $output .= ''; @@ -3249,7 +3249,7 @@ sub www_manageAssets { my $asset = WebGUI::Asset->newByDynamicClass($item->{assetId},$item->{className}); $packages .= ''.$asset->getName.' {assetId}).'">'.$item->{title}.' ' - .editIcon("func=edit&proceed=manageAssets",$asset->get("url")) + .editIcon("func=edit&proceed=manageAssets",$asset->getUrl) .'
'; $hasPackages = 1; }