diff --git a/app/Http/Controllers/Admin/AircraftController.php b/app/Http/Controllers/Admin/AircraftController.php index eccee88a..121e2b51 100644 --- a/app/Http/Controllers/Admin/AircraftController.php +++ b/app/Http/Controllers/Admin/AircraftController.php @@ -56,7 +56,7 @@ class AircraftController extends Controller $w['subfleet_id'] = $request->input('subfleet'); } - $aircraft = $this->aircraftRepo->whereOrder($w, 'registration', 'asc'); + $aircraft = $this->aircraftRepo->with(['subfleet'])->whereOrder($w, 'registration', 'asc'); $aircraft = $aircraft->all(); return view('admin.aircraft.index', [ diff --git a/app/Http/Controllers/Admin/FlightController.php b/app/Http/Controllers/Admin/FlightController.php index 3f970486..b8d34eda 100644 --- a/app/Http/Controllers/Admin/FlightController.php +++ b/app/Http/Controllers/Admin/FlightController.php @@ -133,6 +133,7 @@ class FlightController extends Controller public function index(Request $request) { $flights = $this->flightRepo + ->with(['dpt_airport', 'arr_airport', 'alt_airport', 'airline']) ->searchCriteria($request, false) ->orderBy('flight_number', 'asc') ->paginate(); diff --git a/app/Http/Controllers/Admin/PirepController.php b/app/Http/Controllers/Admin/PirepController.php index e6b5a2e9..8d1d862c 100644 --- a/app/Http/Controllers/Admin/PirepController.php +++ b/app/Http/Controllers/Admin/PirepController.php @@ -199,6 +199,7 @@ class PirepController extends Controller $this->pirepRepo->pushCriteria($criterea); $pireps = $this->pirepRepo + ->with(['airline', 'aircraft', 'dpt_airport', 'arr_airport']) ->whereNotInOrder('state', [ PirepState::CANCELLED, PirepState::DRAFT, diff --git a/app/Http/Controllers/Admin/SubfleetController.php b/app/Http/Controllers/Admin/SubfleetController.php index fe95d689..604b4ec5 100644 --- a/app/Http/Controllers/Admin/SubfleetController.php +++ b/app/Http/Controllers/Admin/SubfleetController.php @@ -119,7 +119,7 @@ class SubfleetController extends Controller */ public function index(Request $request) { - $this->subfleetRepo->pushCriteria(new RequestCriteria($request)); + $this->subfleetRepo->with(['airline'])->pushCriteria(new RequestCriteria($request)); $subfleets = $this->subfleetRepo->all(); return view('admin.subfleets.index', [ diff --git a/app/Http/Controllers/Frontend/PirepController.php b/app/Http/Controllers/Frontend/PirepController.php index 8b6c85a0..13c5e2f7 100644 --- a/app/Http/Controllers/Frontend/PirepController.php +++ b/app/Http/Controllers/Frontend/PirepController.php @@ -180,7 +180,8 @@ class PirepController extends Controller $where = [['user_id', $user->id]]; $where[] = ['state', '<>', PirepState::CANCELLED]; - $this->pirepRepo->pushCriteria(new WhereCriteria($request, $where)); + $this->pirepRepo->with(['airline', 'aircraft', 'dpt_airport', 'arr_airport']) + ->pushCriteria(new WhereCriteria($request, $where)); $pireps = $this->pirepRepo->orderBy('created_at', 'desc')->paginate(); return view('pireps.index', [ diff --git a/app/Widgets/LatestPilots.php b/app/Widgets/LatestPilots.php index 905c4677..bd224ef0 100644 --- a/app/Widgets/LatestPilots.php +++ b/app/Widgets/LatestPilots.php @@ -23,7 +23,7 @@ class LatestPilots extends Widget return view('widgets.latest_pilots', [ 'config' => $this->config, - 'users' => $userRepo->recent($this->config['count']), + 'users' => $userRepo->with(['airline'])->recent($this->config['count']), ]); } } diff --git a/app/Widgets/LatestPireps.php b/app/Widgets/LatestPireps.php index addb7123..5c3873ac 100644 --- a/app/Widgets/LatestPireps.php +++ b/app/Widgets/LatestPireps.php @@ -23,6 +23,7 @@ class LatestPireps extends Widget $pirepRepo = app(PirepRepository::class); $pireps = $pirepRepo + ->with(['airline', 'aircraft']) ->whereNotInOrder('state', [ PirepState::CANCELLED, PirepState::DRAFT,