diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 2c9be0782..00dce6da2 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -2,6 +2,7 @@ - Made a change to LDAP auth that adds an OR to that query so that it also searches for a row with fieldData REGEXP '^uid=(value-from-ldap-directory-server),'. (Wes Morgan) - fixed #10481: i18n outdated message saving - fixed: getNextThread/getPreviousThread won't sort by thread rating + - fixed: #10485: User not returned to asset manager after adding content to /impor 7.7.9 - fixed #10266: Public Profile overrides Able to be friend diff --git a/lib/WebGUI/Macro/AdminBar.pm b/lib/WebGUI/Macro/AdminBar.pm index 3ebbae826..b868fc502 100644 --- a/lib/WebGUI/Macro/AdminBar.pm +++ b/lib/WebGUI/Macro/AdminBar.pm @@ -87,6 +87,7 @@ sub process { # stuff to do if we're on a page with an asset if ($asset) { + my $inAssetManager = $session->form->get('op') eq 'assetManager'; # clipboard my $clipboardItems = $session->asset->getAssetsInClipboard(1); if (scalar (@$clipboardItems)) { @@ -118,6 +119,7 @@ sub process { # assets my %assetList = %{$config->get('assets')}; + my $proceed = $inAssetManager ? ';proceed=manageAssets' : ''; foreach my $assetClass (keys %assetList) { my $dummy = WebGUI::Asset->newByPropertyHashRef($session,{dummy=>1, className=>$assetClass}); next unless defined $dummy; @@ -126,7 +128,7 @@ sub process { next unless exists $categories{$assetList{$assetClass}{category}}; $categories{$assetList{$assetClass}{category}}{items}{$dummy->getTitle} = { icon => $dummy->getIcon(1), - url => $asset->getUrl("func=add;class=".$dummy->get('className')), + url => $asset->getUrl("func=add;class=".$dummy->get('className').$proceed), }; }