diff --git a/lib/WebGUI/Content/AssetManager.pm b/lib/WebGUI/Content/AssetManager.pm index ccbe2ea78..005d6bab2 100644 --- a/lib/WebGUI/Content/AssetManager.pm +++ b/lib/WebGUI/Content/AssetManager.pm @@ -169,56 +169,56 @@ sub getMoreMenu { # These links are shown based on UI level if ( $userUiLevel >= $toolbarUiLevel->{ "changeUrl" } ) { push @more_fields, { - url => '?func=changeUrl;proceed=manageAssets', + url => 'func=changeUrl;proceed=manageAssets', label => $i18n->get( 'change url' ), }; } if ( $userUiLevel >= $toolbarUiLevel->{ "editBranch" } ) { push @more_fields, { - url => '?func=editBranch', + url => 'func=editBranch', label => $i18n->get( 'edit branch' ), }; } if ( $userUiLevel >= $toolbarUiLevel->{ "shortcut" } ) { push @more_fields, { - url => '?func=createShortcut;proceed=manageAssets', + url => 'func=createShortcut;proceed=manageAssets', label => $i18n->get( 'create shortcut' ), }; } if ( $userUiLevel >= $toolbarUiLevel->{ "revisions" } ) { push @more_fields, { - url => '?func=manageRevisions', + url => 'func=manageRevisions', label => $i18n->get( 'revisions' ), }; } if ( $userUiLevel >= $toolbarUiLevel->{ "view" } ) { push @more_fields, { - url => '', + url => '', label => $i18n->get( 'view' ), }; } if ( $userUiLevel >= $toolbarUiLevel->{ "edit" } ) { push @more_fields, { - url => '?func=edit;proceed=manageAssets', + url => 'func=edit;proceed=manageAssets', label => $i18n->get( 'edit' ), }; } if ( $userUiLevel >= $toolbarUiLevel->{ "lock" } ) { push @more_fields, { - url => '?func=lock;proceed=manageAssets', + url => 'func=lock;proceed=manageAssets', label => $i18n->get( 'lock' ), }; } if ( $session->config->get("exportPath") && $userUiLevel >= $toolbarUiLevel->{"export"} ) { push @more_fields, { - url => '?func=export', + url => 'func=export', label => $i18n->get( 'Export Page' ), }; } diff --git a/www/extras/yui-webgui/build/assetManager/assetManager.js b/www/extras/yui-webgui/build/assetManager/assetManager.js index d7e68cbe5..eb418c639 100644 --- a/www/extras/yui-webgui/build/assetManager/assetManager.js +++ b/www/extras/yui-webgui/build/assetManager/assetManager.js @@ -49,9 +49,9 @@ WebGUI.AssetManager.buildMoreMenu = function ( url, linkElement, isNotLocked ) { var menuItems = []; var isLocked = !isNotLocked; for ( var i = 0; i < rawItems.length; i++ ) { - var itemUrl = rawItems[i].url.match( // ) - ? rawItems[i].url.replace( /(?:\?(.*))?/, WebGUI.AssetManager.appendToUrl(url, "$1") ) - : url + rawItems[i].url + var itemUrl = rawItems[i].url + ? WebGUI.AssetManager.appendToUrl(url, rawItems[i].url) + : url ; if (! (itemUrl.match( /func=edit;/) && isLocked )) { menuItems.push( { "url" : itemUrl, "text" : rawItems[i].label } );