tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Stop IE6/IE7 from redirecting in admin/assets after deleting multiple folders (fixes #5208)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101969 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-03-31 05:00:02 +00:00 committed by Sam Minnee
parent b055154586
commit f5be047b97
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/AssetAdmin.php
View File

@ -650,7 +650,8 @@ JS;
} }
$script .= "statusMessage('$message');"; $script .= "statusMessage('$message');";
echo $script;
return $script;
} }
public function removefile(){ public function removefile(){
@ -662,7 +663,7 @@ JS;
} }
$file->delete(); $file->delete();
$file->destroy(); $file->destroy();
if(Director::is_ajax()) { if(Director::is_ajax()) {
echo <<<JS echo <<<JS
$('Form_EditForm_Files').removeFile($fileID); $('Form_EditForm_Files').removeFile($fileID);

5
javascript/AssetAdmin.js
View File

@ -432,7 +432,7 @@ var deletefolder = {
errorMessage('Error deleting pages', response); errorMessage('Error deleting pages', response);
} }
}); });
$('deletepage').getElementsByTagName('button')[0].onclick(); $('deletepage').getElementsByTagName('button')[0].onclick();
} else { } else {
@ -506,7 +506,8 @@ appendLoader(function () {
onsubmit: function(event) { onsubmit: function(event) {
deletefolder.form_submit(); deletefolder.form_submit();
Event.stop(event); Event.stop(event);
} return false;
}
} }
}); });
Element.hide('Form_DeleteItemsForm'); Element.hide('Form_DeleteItemsForm');