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

Merge branch 'dev' of github.com:nabeelio/phpvms into dev

Browse Source
This commit is contained in:
Nabeel Shahzad
2020-03-01 11:18:39 -05:00
parent 660c5303cb f78d065858
commit a040e288de
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@ class AircraftController extends Controller
return view('admin.aircraft.create', [ return view('admin.aircraft.create', [
'airports' => $this->airportRepo->selectBoxList(), 'airports' => $this->airportRepo->selectBoxList(),
'subfleets' => Subfleet::all()->pluck('name', 'id'), 'subfleets' => Subfleet::all()->pluck('name', 'id'),
'statuses' => AircraftStatus::select(true), 'statuses' => AircraftStatus::select(false),
'subfleet_id' => $request->query('subfleet'), 'subfleet_id' => $request->query('subfleet'),
]); ]);
} }
@@ -88,7 +88,11 @@ class AircraftController extends Controller
/** /**
* Store a newly created Aircraft in storage. * Store a newly created Aircraft in storage.
* *
* @param \App\Http\Requests\CreateAircraftRequest $request
*
* @throws \Prettus\Validator\Exceptions\ValidatorException * @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/ */
public function store(CreateAircraftRequest $request) public function store(CreateAircraftRequest $request)
{ {
@@ -140,14 +144,15 @@ class AircraftController extends Controller
'aircraft' => $aircraft, 'aircraft' => $aircraft,
'airports' => $this->airportRepo->selectBoxList(), 'airports' => $this->airportRepo->selectBoxList(),
'subfleets' => Subfleet::all()->pluck('name', 'id'), 'subfleets' => Subfleet::all()->pluck('name', 'id'),
'statuses' => AircraftStatus::select(true), 'statuses' => AircraftStatus::select(false),
]); ]);
} }
/** /**
* Update the specified Aircraft in storage. * Update the specified Aircraft in storage.
* *
* @param mixed $id * @param mixed $id
* @param UpdateAircraftRequest $request
* *
* @throws \Prettus\Validator\Exceptions\ValidatorException * @throws \Prettus\Validator\Exceptions\ValidatorException
* *

1
app/Models/Aircraft.php
View File

@@ -58,6 +58,7 @@ class Aircraft extends Model
public static $rules = [ public static $rules = [
'subfleet_id' => 'required', 'subfleet_id' => 'required',
'name' => 'required', 'name' => 'required',
'status' => 'required',
'registration' => 'required', 'registration' => 'required',
]; ];