fixed: after editting assets from the asset manager, it returns to site instead of manager

docs/changelog/7.x.x.txt

@@ -1,4 +1,5 @@
 7.6.0
+ - fixed: after editting assets from the asset manager, it returns to site instead of manager
  - improved Rich Text selection list, changed CS and Wiki to use it
  - fixed: invalid HTML generated for Shortcut overrides tab
  - fixed: copying or duplicating an asset in the asset manager never autocommits

lib/WebGUI/Content/AssetManager.pm

@@ -762,7 +762,7 @@ sub www_search {
                 if ( !$asset->lockedBy || $asset->canEditIfLocked ) {
                     $fields{ editLink } 
                         = sprintf '<a href="%s">' . $i18n->get( "edit" ) . '</a>',
-                        $asset->getUrl( 'func=edit' )
+                        $asset->getUrl( 'func=edit;proceed=manageAssets' )
                         ;
                 }
 

www/extras/yui-webgui/build/assetManager/assetManager.js

@@ -86,7 +86,7 @@ WebGUI.AssetManager.formatActions
 
     var menu    = new YAHOO.widget.Menu( "moreMenu" + oRecord.getData( 'assetId' ), options );
     YAHOO.util.Event.onDOMReady( function () { menu.render( document.getElementById( 'assetManager' ) ) } );
-    YAHOO.util.Event.addListener( more, "click", function () { menu.show(); menu.focus(); }, null, menu );
+    YAHOO.util.Event.addListener( more, "click", function (e) { menu.show(); menu.focus(); YAHOO.util.Event.stopEvent(e); }, null, menu );
 };
 
 /*---------------------------------------------------------------------------