From 2158d13b45d10715f467cb9bec7fe29a5713a545 Mon Sep 17 00:00:00 2001 From: Graham Knop Date: Wed, 27 Aug 2008 15:09:35 +0000 Subject: [PATCH] fixed: after editting assets from the asset manager, it returns to site instead of manager --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Content/AssetManager.pm | 2 +- www/extras/yui-webgui/build/assetManager/assetManager.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 77693dc38..d1d91360e 100644 --- a/docs/changelog/7.x.x.txt +++ b/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 diff --git a/lib/WebGUI/Content/AssetManager.pm b/lib/WebGUI/Content/AssetManager.pm index 65ddf8f2a..80313943c 100644 --- a/lib/WebGUI/Content/AssetManager.pm +++ b/lib/WebGUI/Content/AssetManager.pm @@ -762,7 +762,7 @@ sub www_search { if ( !$asset->lockedBy || $asset->canEditIfLocked ) { $fields{ editLink } = sprintf '' . $i18n->get( "edit" ) . '', - $asset->getUrl( 'func=edit' ) + $asset->getUrl( 'func=edit;proceed=manageAssets' ) ; } diff --git a/www/extras/yui-webgui/build/assetManager/assetManager.js b/www/extras/yui-webgui/build/assetManager/assetManager.js index 60e749cde..12cff84c8 100644 --- a/www/extras/yui-webgui/build/assetManager/assetManager.js +++ b/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 ); }; /*---------------------------------------------------------------------------