diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index 0f6b20fb9..ce1dfb2b3 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -768,7 +768,7 @@ sub www_copyList { $newAsset->cut; } } - return $self->manageAssets(); + return $self->www_manageAssets(); } sub www_cut { @@ -787,7 +787,7 @@ sub www_cutList { $asset->cut; } } - return $self->manageAssets(); + return $self->www_manageAssets(); } sub www_delete { @@ -806,7 +806,7 @@ sub www_deleteList { $asset->trash; } } - return $self->manageAssets(); + return $self->www_manageAssets(); } sub www_demote { @@ -906,8 +906,7 @@ sub www_manageAssets { $output .= "labels['properties'] = 'Properties';\n"; $output .= "labels['editTree'] = 'Edit Tree';\n"; $output .= "var manager = new AssetManager(assets,columnHeadings,labels,crumbtrail); manager.renderAssets();\n\n"; - $output .= '
-
+ $output .= '
 
'.WebGUI::International::get(1083).'
'; @@ -936,8 +935,7 @@ sub www_manageAssets { $output .= '
  -
-
+
'; return $self->getAdminConsole->render($output); } @@ -956,7 +954,7 @@ sub www_pasteList { foreach my $clipId ($session{cgi}->param("assetId")) { $self->paste($clipId); } - return $self->manageAssets(); + return $self->www_manageAssets(); } sub www_promote { diff --git a/www/extras/assetManager/AssetManager.js b/www/extras/assetManager/AssetManager.js index df6ca63f8..766cb1d15 100644 --- a/www/extras/assetManager/AssetManager.js +++ b/www/extras/assetManager/AssetManager.js @@ -212,7 +212,6 @@ function AssetManager_remove() { function AssetManager_getSelectedAssetIds() { var assetIds = ""; - alert(this.display.overObjects.length); for (i=0;i