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

Fix aircraft active/inactive states

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-02-22 14:59:09 -06:00
parent 8931f4e271
commit 3748ab77d2
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Admin/AircraftController.php
View File

@@ -55,8 +55,11 @@ class AircraftController extends BaseController
*/ */
public function store(CreateAircraftRequest $request) public function store(CreateAircraftRequest $request)
{ {
$input = $request->all(); $attrs = $request->all();
$aircraft = $this->aircraftRepository->create($input);
$attrs['active'] = get_truth_state($attrs['active']);
$aircraft = $this->aircraftRepository->create($attrs);
Flash::success('Aircraft saved successfully.'); Flash::success('Aircraft saved successfully.');
return redirect(route('admin.aircraft.edit', ['id' => $aircraft->id])); return redirect(route('admin.aircraft.edit', ['id' => $aircraft->id]));
@@ -110,7 +113,10 @@ class AircraftController extends BaseController
return redirect(route('admin.aircraft.index')); return redirect(route('admin.aircraft.index'));
} }
$this->aircraftRepository->update($request->all(), $id); $attrs = $request->all();
$attrs['active'] = get_truth_state($attrs['active']);
$this->aircraftRepository->update($attrs, $id);
Flash::success('Aircraft updated successfully.'); Flash::success('Aircraft updated successfully.');
return redirect(route('admin.aircraft.index')); return redirect(route('admin.aircraft.index'));

4
resources/views/admin/aircraft/fields.blade.php
View File

@@ -38,8 +38,8 @@
{!! Form::label('active', 'Active:') !!} {!! Form::label('active', 'Active:') !!}
<br /> <br />
<label class="checkbox-inline"> <label class="checkbox-inline">
{!! Form::hidden('active', 0, false) !!} {!! Form::hidden('active', 0) !!}
{!! Form::checkbox('active', 1, null) !!} {!! Form::checkbox('active') !!}
</label> </label>
</div> </div>
</div> </div>

2
resources/views/admin/aircraft/table.blade.php
View File

@@ -27,7 +27,7 @@
{!! Utils::minutesToTimeString($ac->flight_hours) !!} {!! Utils::minutesToTimeString($ac->flight_hours) !!}
</td> </td>
<td style="text-align: center;"> <td style="text-align: center;">
@if($ac->active === GenericState::ACTIVE) @if($ac->active == GenericState::ACTIVE)
<span class="label label-success">{!! GenericState::label($ac->active); !!}</span> <span class="label label-success">{!! GenericState::label($ac->active); !!}</span>
@else @else
<span class="label label-default">Inactive</span> <span class="label label-default">Inactive</span>