FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Design and file upload issues (#399)

Browse Source 
* Fix some styling issues/edit button on PIREP overview page

* Fix validation for file/url upload

* Formatting
This commit is contained in:
Nabeel S
2019-09-16 15:17:51 -04:00
committed by GitHub
parent aedb1f22b6
commit 6e9dcf8a31
20 changed files with 249 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/Admin/FileController.php
View File

@@ -6,7 +6,6 @@ use App\Contracts\Controller;
use App\Models\File;
use App\Services\FileService;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule;
@@ -53,18 +52,20 @@ class FileController extends Controller
[
'file_name' => 'required',
'file_description' => 'nullable',
'file' => [
'file' => 'nullable|file',
'url' => 'nullable|url',
/*'file' => [
Rule::requiredIf(function () {
return !request()->filled('url');
return request()->filled('url') === false;
}),
'file',
],
'url' => [
Rule::requiredIf(function () {
return !request()->hasFile('file');
return request()->hasFile('file') === false;
}),
'url',
],
],*/
],
[
'file.required' => 'File or URL are required',
@@ -76,7 +77,12 @@ class FileController extends Controller
return redirect()
->back()
->withErrors($validator)
->withInput(Input::all());
->withInput($request->all());
}
if (!$request->hasFile('file') && !$request->filled('url')) {
$validator->errors()->add('url', 'A URL or file must be uploaded!');
return redirect()->back()->withErrors($validator)->withInput($request->all());
}
Log::info('Uploading files', $attrs);