AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve error reporting when file upload is not configured properly

Browse Source
This commit is contained in:
Frederic Guillot
2017-02-12 13:34:56 -05:00
parent a172e3ad8d
commit 991f7426e8
35 changed files with 129 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/AvatarFileController.php
View File

@@ -33,7 +33,7 @@ class AvatarFileController extends BaseController
$user = $this->getUser();
if (! $this->avatarFileModel->uploadImageFile($user['id'], $this->request->getFileInfo('avatar'))) {
$this->flash->failure(t('Unable to upload the file.'));
$this->flash->failure(t('Unable to upload files, check the permissions of your data folder.'));
}
$this->response->redirect($this->helper->url->to('AvatarFileController', 'show', array('user_id' => $user['id'])));

17
app/Controller/ProjectFileController.php
View File

@@ -33,12 +33,21 @@ class ProjectFileController extends BaseController
public function save()
{
$project = $this->getProject();
$result = $this->projectFileModel->uploadFiles($project['id'], $this->request->getFileInfo('files'));
if (! $this->projectFileModel->uploadFiles($project['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('ProjectOverviewController', 'show', array('project_id' => $project['id'])), true);
}
$this->response->redirect($this->helper->url->to('ProjectOverviewController', 'show', array('project_id' => $project['id'])), true);
}
/**

17
app/Controller/TaskFileController.php
View File

@@ -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);
}
/**