Improve error reporting when file upload is not configured properly

1 files changed, 13 insertions, 4 deletions

diff --git a/app/Controller/TaskFileController.php b/app/Controller/TaskFileController.php
index 8a0971e4..ff0c299e 100644
--- a/app/Controller/TaskFileController.php
+++ b/app/Controller/TaskFileController.php
@@ -52,12 +52,21 @@ class TaskFileController extends BaseController
     public function save()
     {
         $task = $this->getTask();
+        $result = $this->taskFileModel->uploadFiles($task['id'], $this->request->getFileInfo('files'));
 
-        if (! $this->taskFileModel->uploadFiles($task['id'], $this->request->getFileInfo('files'))) {
-            $this->flash->failure(t('Unable to upload the file.'));
-        }
+        if ($this->request->isAjax()) {
+            if (! $result) {
+                $this->response->json(array('message' => t('Unable to upload files, check the permissions of your data folder.')), 500);
+            } else {
+                $this->response->json(array('message' => 'OK'));
+            }
+        } else {
+            if (! $result) {
+                $this->flash->failure(t('Unable to upload files, check the permissions of your data folder.'));
+            }
 
-        $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
+            $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true);
+        }
     }
 
     /**