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

Improve file upload

Browse Source
This commit is contained in:
Frédéric Guillot
2014-05-25 15:15:59 -04:00
parent f9753e91d2
commit 60a45dbb68
8 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Controller/File.php
View File

@@ -24,6 +24,7 @@ class File extends Base
$this->response->html($this->taskLayout('file_new', array( $this->response->html($this->taskLayout('file_new', array(
'task' => $task, 'task' => $task,
'menu' => 'tasks', 'menu' => 'tasks',
'max_size' => ini_get('upload_max_filesize'),
'title' => t('Attach a document') 'title' => t('Attach a document')
))); )));
} }
@@ -36,8 +37,14 @@ class File extends Base
public function save() public function save()
{ {
$task = $this->getTask(); $task = $this->getTask();
$this->file->upload($task['project_id'], $task['id'], 'files');
$this->response->redirect('?controller=task&action=show&task_id='.$task['id'].'#attachments'); if ($this->file->upload($task['project_id'], $task['id'], 'files') === true) {
$this->response->redirect('?controller=task&action=show&task_id='.$task['id'].'#attachments');
}
else {
$this->session->flashError(t('Unable to upload the file.'));
$this->response->redirect('?controller=file&action=create&task_id='.$task['id']);
}
} }
/** /**

2
app/Locales/de_DE/translations.php
View File

@@ -371,4 +371,6 @@ return array(
// 'Unable to update your sub-task.' => '', // 'Unable to update your sub-task.' => '',
// 'Unable to create your sub-task.' => '', // 'Unable to create your sub-task.' => '',
// 'Sub-task added successfully.' => '', // 'Sub-task added successfully.' => '',
// 'Maximum size: ' => '',
// 'Unable to upload the file.' => '',
); );

2
app/Locales/es_ES/translations.php
View File

@@ -369,4 +369,6 @@ return array(
// 'Unable to update your sub-task.' => '', // 'Unable to update your sub-task.' => '',
// 'Unable to create your sub-task.' => '', // 'Unable to create your sub-task.' => '',
// 'Sub-task added successfully.' => '', // 'Sub-task added successfully.' => '',
// 'Maximum size: ' => '',
// 'Unable to upload the file.' => '',
); );

2
app/Locales/fr_FR/translations.php
View File

@@ -369,4 +369,6 @@ return array(
'Unable to update your sub-task.' => 'Impossible de mettre à jour votre sous-tâche.', 'Unable to update your sub-task.' => 'Impossible de mettre à jour votre sous-tâche.',
'Unable to create your sub-task.' => 'Impossible de créer votre sous-tâche.', 'Unable to create your sub-task.' => 'Impossible de créer votre sous-tâche.',
'Sub-task added successfully.' => 'Sous-tâche ajouté avec succès.', 'Sub-task added successfully.' => 'Sous-tâche ajouté avec succès.',
'Maximum size: ' => 'Taille maximum : ',
'Unable to upload the file.' => 'Impossible de transférer le fichier.',
); );

2
app/Locales/pl_PL/translations.php
View File

@@ -374,4 +374,6 @@ return array(
// 'Unable to update your sub-task.' => '', // 'Unable to update your sub-task.' => '',
// 'Unable to create your sub-task.' => '', // 'Unable to create your sub-task.' => '',
// 'Sub-task added successfully.' => '', // 'Sub-task added successfully.' => '',
// 'Maximum size: ' => '',
// 'Unable to upload the file.' => '',
); );

2
app/Locales/pt_BR/translations.php
View File

@@ -370,4 +370,6 @@ return array(
// 'Unable to update your sub-task.' => '', // 'Unable to update your sub-task.' => '',
// 'Unable to create your sub-task.' => '', // 'Unable to create your sub-task.' => '',
// 'Sub-task added successfully.' => '', // 'Sub-task added successfully.' => '',
// 'Maximum size: ' => '',
// 'Unable to upload the file.' => '',
); );

2
app/Model/File.php
View File

@@ -159,7 +159,7 @@ class File extends Base
if (@move_uploaded_file($uploaded_filename, self::BASE_PATH.$destination_filename)) { if (@move_uploaded_file($uploaded_filename, self::BASE_PATH.$destination_filename)) {
$this->create( return $this->create(
$task_id, $task_id,
$original_filename, $original_filename,
$destination_filename, $destination_filename,

1
app/Templates/file_new.php
View File

@@ -4,6 +4,7 @@
<form action="?controller=file&amp;action=save&amp;task_id=<?= $task['id'] ?>" method="post" enctype="multipart/form-data"> <form action="?controller=file&amp;action=save&amp;task_id=<?= $task['id'] ?>" method="post" enctype="multipart/form-data">
<input type="file" name="files[]" multiple /> <input type="file" name="files[]" multiple />
<div class="form-help"><?= t('Maximum size: ') ?><?= is_integer($max_size) ? Helper\format_bytes($max_size) : $max_size ?></div>
<div class="form-actions"> <div class="form-actions">
<input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/> <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
<?= t('or') ?> <?= t('or') ?>