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

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

Browse source
This commit is contained in:
Graham Knop 2008-08-27 15:09:35 +00:00
parent 0f41a4916a
commit 2158d13b45
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -1,4 +1,5 @@
7.6.0 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 - improved Rich Text selection list, changed CS and Wiki to use it
- fixed: invalid HTML generated for Shortcut overrides tab - fixed: invalid HTML generated for Shortcut overrides tab
- fixed: copying or duplicating an asset in the asset manager never autocommits - fixed: copying or duplicating an asset in the asset manager never autocommits

2
lib/WebGUI/Content/AssetManager.pm
View file

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

2
www/extras/yui-webgui/build/assetManager/assetManager.js vendored
View file

@ -86,7 +86,7 @@ WebGUI.AssetManager.formatActions
var menu = new YAHOO.widget.Menu( "moreMenu" + oRecord.getData( 'assetId' ), options ); var menu = new YAHOO.widget.Menu( "moreMenu" + oRecord.getData( 'assetId' ), options );
YAHOO.util.Event.onDOMReady( function () { menu.render( document.getElementById( 'assetManager' ) ) } ); 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 );
}; };
/*--------------------------------------------------------------------------- /*---------------------------------------------------------------------------