FEATURE: allow multiple uploads
This commit is contained in:
Michal Kváček
@@ -1,8 +1,8 @@
|
||||
<?php
|
||||
namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Http\Requests\UploadFileRequest;
|
||||
use App\Models\File;
|
||||
use App\Http\Requests\Request;
|
||||
use Symfony\Component\HttpFoundation\File\Exception\FileException;
|
||||
|
||||
class UploadFile extends Controller
|
||||
@@ -22,28 +22,31 @@ class UploadFile extends Controller
|
||||
/**
|
||||
* Uploads any file
|
||||
*
|
||||
* @param UploadFileRequest $request
|
||||
*
|
||||
* @return \Illuminate\Http\RedirectResponse
|
||||
*/
|
||||
public function postFile(UploadFileRequest $request)
|
||||
public function postFile(Request $request)
|
||||
{
|
||||
if (!$request->hasFile('file')) {
|
||||
return $this->invalidUpload('noFileSpecified');
|
||||
}
|
||||
|
||||
try {
|
||||
$uploadedFile = $this->file->upload($request->file('file'), $request);
|
||||
$uploadedFiles = [];
|
||||
$files = $request->all()['files'];
|
||||
$successfullUploads = 0;
|
||||
|
||||
foreach ($files as $file) {
|
||||
$uploadedFile = $this->file->upload($file, $request);
|
||||
$successfullUploads++;
|
||||
|
||||
$uploadedFiles[] = $uploadedFile;
|
||||
}
|
||||
|
||||
// we do not want to redirect
|
||||
if ($request->ajax()) {
|
||||
return $this->jsonResponse($uploadedFile);
|
||||
return $this->jsonResponse($uploadedFiles);
|
||||
}
|
||||
|
||||
// upload was not performed via ajax, redirect user
|
||||
return redirect()
|
||||
->route('upload.overview', ['directory' => $request->directoryId])
|
||||
->with('success', trans('admin/fileManager.uploadSuccessfull'));
|
||||
->with('success', trans_choice('admin/fileManager.uploadSuccessfull', $successfullUploads));
|
||||
} catch (FileException $e) {
|
||||
return $this->invalidUpload('invalidFile');
|
||||
}
|
||||
@@ -52,7 +55,7 @@ class UploadFile extends Controller
|
||||
protected function invalidUpload($message)
|
||||
{
|
||||
return redirect()
|
||||
->route('upload.file')
|
||||
->route('upload.overview')
|
||||
->with('error', trans('admin/fileManager.' . $message));
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ namespace App\Http\Requests;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
|
||||
abstract class Request extends FormRequest
|
||||
class Request extends FormRequest
|
||||
{
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
@@ -13,7 +13,11 @@ abstract class Request extends FormRequest
|
||||
*/
|
||||
public function authorize()
|
||||
{
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public function rules()
|
||||
{
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests;
|
||||
|
||||
class UploadFileRequest extends UploadRequest
|
||||
{
|
||||
/**
|
||||
* @internal param array $rules
|
||||
*/
|
||||
protected function setRules()
|
||||
{
|
||||
$this->rules = ['file' => 'required'];
|
||||
}
|
||||
}
|
||||
@@ -1,41 +1,41 @@
|
||||
<?php
|
||||
return [
|
||||
"createSubdirectoryFor" => "Vytvořit podadresář v :directory.",
|
||||
"createdAt" => "Nahráno",
|
||||
"description" => "Popis souboru",
|
||||
"directories" => "Podadresáře v adresáři :directory",
|
||||
"directoryDescription" => "Popis",
|
||||
"directoryHidden" => "Skrytý adresář",
|
||||
"directoryName" => "Jméno adresáře",
|
||||
"edit" => "Upravit soubor :name",
|
||||
"editButton" => "Upravit",
|
||||
"editDirectory" => "Upravit adresář",
|
||||
"editDirectorySuccess" => "Úspěšně uloženo",
|
||||
"encoding" => "Kódování",
|
||||
"fileDeleted" => "Soubor smazán",
|
||||
"fileInfo" => "Informace",
|
||||
"fileSize" => "Velikost",
|
||||
"hash" => "Hash",
|
||||
"invalidFile" => "Nahrávaný soubor nelze nahrát, z nějakého důvodu není validní.",
|
||||
"keywords" => "Klíčová slova (oddělena čárkou)",
|
||||
"mime" => "MIME typ",
|
||||
"name" => "Jméno",
|
||||
"newDirectory" => "Vytvořit nový adresář",
|
||||
"newDirectorySuccess" => "Nový adresář úspěšně vytvořen",
|
||||
"newFile" => "Nový soubor",
|
||||
"noFileSpecified" => "Nebyl zvolen žádný soubor k nahrávání",
|
||||
"noFiles" => "Žádný soubor nebyl nalezen",
|
||||
"noSubdirectories" => "Žádné podadresáře",
|
||||
"originalFilename" => "Původní jméno",
|
||||
"overview" => "Seznam všech souborů",
|
||||
"parentDirectory" => "Rodičovský adresář",
|
||||
"resolution" => "Rozlišení",
|
||||
"rootDirectories" => "Kořenové adresáře",
|
||||
"selectFile" => "Vybrat soubor",
|
||||
"subdirectoryExists" => "Adresář s tímto jménem tu již eixstuje",
|
||||
"successfullyChanged" => "Úspěšně uloženo",
|
||||
"updatedAt" => "Poslední změna",
|
||||
"upload" => "Nahrát nový soubor",
|
||||
"uploadSuccessfull" => "Soubor úspěšně nahrán",
|
||||
"url" => "Veřejá URL",
|
||||
"createSubdirectoryFor" => "Vytvořit podadresář v :directory.",
|
||||
"createdAt" => "Nahráno",
|
||||
"description" => "Popis souboru",
|
||||
"directories" => "Podadresáře v adresáři :directory",
|
||||
"directoryDescription" => "Popis",
|
||||
"directoryHidden" => "Skrytý adresář",
|
||||
"directoryName" => "Jméno adresáře",
|
||||
"edit" => "Upravit soubor :name",
|
||||
"editButton" => "Upravit",
|
||||
"editDirectory" => "Upravit adresář",
|
||||
"editDirectorySuccess" => "Úspěšně uloženo",
|
||||
"encoding" => "Kódování",
|
||||
"fileDeleted" => "Soubor smazán",
|
||||
"fileInfo" => "Informace",
|
||||
"fileSize" => "Velikost",
|
||||
"hash" => "Hash",
|
||||
"invalidFile" => "Nahrávaný soubor nelze nahrát, z nějakého důvodu není validní.",
|
||||
"keywords" => "Klíčová slova (oddělena čárkou)",
|
||||
"mime" => "MIME typ",
|
||||
"name" => "Jméno",
|
||||
"newDirectory" => "Vytvořit nový adresář",
|
||||
"newDirectorySuccess" => "Nový adresář úspěšně vytvořen",
|
||||
"newFile" => "Nový soubor",
|
||||
"noFileSpecified" => "Nebyl zvolen žádný soubor k nahrávání",
|
||||
"noFiles" => "Žádný soubor nebyl nalezen",
|
||||
"noSubdirectories" => "Žádné podadresáře",
|
||||
"originalFilename" => "Původní jméno",
|
||||
"overview" => "Seznam všech souborů",
|
||||
"parentDirectory" => "Rodičovský adresář",
|
||||
"resolution" => "Rozlišení",
|
||||
"rootDirectories" => "Kořenové adresáře",
|
||||
"selectFile" => "Vybrat soubor",
|
||||
"subdirectoryExists" => "Adresář s tímto jménem tu již eixstuje",
|
||||
"successfullyChanged" => "Úspěšně uloženo",
|
||||
"updatedAt" => "Poslední změna",
|
||||
"upload" => "Nahrát nový soubor",
|
||||
"uploadSuccessfull" => "Soubor úspěšně nahrán|:count soubory úspěšně nahrány|:count souborů úspěšně nahráno",
|
||||
"url" => "Veřejá URL",
|
||||
];
|
||||
|
||||
@@ -18,7 +18,7 @@ return [
|
||||
'mime' => 'MIME type',
|
||||
'invalidFile' => 'The file you submitted is somehow not valid file!',
|
||||
'noFileSpecified' => 'You have not specified any file for upload',
|
||||
'uploadSuccessfull' => 'Your file was successfully uploaded',
|
||||
'uploadSuccessfull' => 'Your file was successfully uploaded|:count files successfully uploaded',
|
||||
'selectFile' => 'Select file for upload',
|
||||
'name' => 'Name',
|
||||
'keywords' => 'Keywords (comma separated)',
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
<label>
|
||||
@lang('admin/fileManager.selectFile')
|
||||
|
||||
<input type="file" name="file" id="file" />
|
||||
<input type="file" multiple name="files[]" id="file" />
|
||||
|
||||
@if (isset($errors) && $errors->has('file'))
|
||||
@if (isset($errors) && $errors->has('files[]'))
|
||||
<div class="callout alert">
|
||||
{{ $errors->first('file') }}
|
||||
{{ $errors->first('files[]') }}
|
||||
</div>
|
||||
@endif
|
||||
</label>
|
||||
|
||||
Reference in New Issue
Block a user