Fixes to file uploading; include disk name, remove clunky redirect code

This commit is contained in:
Nabeel Shahzad
2018-04-02 11:04:32 -05:00
parent 6c516cf4bf
commit 026a83591d
10 changed files with 97 additions and 90 deletions

View File

@@ -17,10 +17,7 @@
<div class="card border-blue-bottom">
<div class="content">
@include('admin.common.file_upload', [
'model' => $aircraft,
'redirect' => route('admin.aircraft.edit', ['id' => $aircraft->id])
])
@include('admin.common.file_upload', ['model' => $aircraft])
</div>
</div>
@endsection

View File

@@ -21,10 +21,7 @@
<div class="card border-blue-bottom">
<div class="content">
@include('admin.common.file_upload', [
'model' => $airport,
'redirect' => route('admin.airports.edit', ['id' => $airport->id])
])
@include('admin.common.file_upload', ['model' => $airport])
</div>
</div>
@endsection

View File

@@ -5,7 +5,7 @@ Pass in:
$redirect - Where to go to
--}}
<div id="airport-files-wrapper">
<div id="airport-files-wrapper" class="col-12">
<div class="header">
<h3>files</h3>
</div>
@@ -29,7 +29,6 @@ Pass in:
<td class="text-right">
{{ Form::open(['route' => ['admin.files.delete', $file->id], 'method' => 'delete']) }}
{{ Form::hidden('id', $file->id) }}
{{ Form::hidden('redirect', $redirect) }}
{{ Form::button('<i class="fa fa-times"></i>', [
'type' => 'submit',
'class' => 'btn btn-sm btn-danger btn-icon',
@@ -43,7 +42,7 @@ Pass in:
</table>
<hr>
<div class="row">
<div class="col-12">
<div class="col-sm-12">
<div class="text-right">
{{ Form::open([
'url' => route('admin.files.store'),
@@ -56,16 +55,17 @@ Pass in:
{{-- Fields for the model --}}
{{ Form::hidden('ref_model', get_class($model)) }}
{{ Form::hidden('ref_model_id', $model->id) }}
{{ Form::hidden('redirect', $redirect) }}
{{ Form::label('name', 'Name:') }}&nbsp;<span class="required">*</span>
{{ Form::text('name', null, ['class' => 'form-control']) }}
{{ Form::label('filename', 'Name:') }}&nbsp;<span class="required">*</span>
{{ Form::text('filename', null, ['class' => 'form-control']) }}
{{ Form::file('file', ['class' => 'form-control']) }}
{{ Form::submit('Upload', ['class' => 'btn btn-success']) }}
<p class="text-danger">{{ $errors->first('name') }}</p>
<p class="text-danger">{{ $errors->first('file') }}</p>
<div class="text-danger" style="padding-top: 10px;">
<span>{{ $errors->first('filename') }}</span>
<span>{{ $errors->first('file') }}</span>
</div>
{{ Form::close() }}
</div>