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

Merge pull request #1990 from jason-zz/patch-1

Browse Source 
BUG UploadField overwriteWarning isn't working in AssetAdmin
This commit is contained in:
Daniel Hensby 2017-10-13 14:31:55 +01:00 committed by GitHub
commit 0f2ff54557
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/controllers/CMSFileAddController.php
View File

@ -103,6 +103,11 @@ class CMSFileAddController extends LeftAndMain {
); );
$form->loadDataFrom($folder); $form->loadDataFrom($folder);
if($this->currentPageID()){
// Make sure this controller know current folder when AJAX 'fileexists' is fired.
$uploadField->setConfig('urlFileExists', Controller::join_links($uploadField->link('fileexists'), '?ID=' . $this->currentPageID()));
}
$this->extend('updateEditForm', $form); $this->extend('updateEditForm', $form);
return $form; return $form;