From fd39faeefd5241cf96313e968142183de767c51b Mon Sep 17 00:00:00 2001
From: Jason <jason-zz@users.noreply.github.com>
Date: Thu, 12 Oct 2017 14:40:48 +1100
Subject: [PATCH] BUG UploadField overwriteWarning isn't working in AssetAdmin

When UploadField overwriteWarning is enabled, no overwrite warning message for uploading file in non-root folder. This fix will let CMSFileAddController know the current folder when 'fileexists' AJAX request is called.
---
 code/controllers/CMSFileAddController.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/controllers/CMSFileAddController.php b/code/controllers/CMSFileAddController.php
index ea7c5cb1..42273788 100644
--- a/code/controllers/CMSFileAddController.php
+++ b/code/controllers/CMSFileAddController.php
@@ -102,6 +102,11 @@ class CMSFileAddController extends LeftAndMain {
 			)
 		);
 		$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);