From 76319ae4d4791965ad3f0dc297b3ffa178322161 Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Tue, 13 Nov 2018 22:08:30 -0600 Subject: [PATCH] errors --- app/Http/Controllers/FleetsController.php | 7 +++++-- resources/views/fleets/displayfleets.blade.php | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/FleetsController.php b/app/Http/Controllers/FleetsController.php index aa9406f71..d2a00a45f 100644 --- a/app/Http/Controllers/FleetsController.php +++ b/app/Http/Controllers/FleetsController.php @@ -101,8 +101,11 @@ class FleetsController extends Controller $fleet = DB::table('Fleets')->where('fleet', $fleetId)->get(); //Add a pilot to the fleet $error = $newPilot->AddPilot($fleet[0]->character_id, $charId); - - return redirect('/fleets/display'); + if($error) { + return view('fleets.displayfleet')->with($error)->with('data', null); + } else { + return redirect('/fleets/display'); + } } public function updateFleet() { diff --git a/resources/views/fleets/displayfleets.blade.php b/resources/views/fleets/displayfleets.blade.php index f5381d9d9..2f1a255f5 100644 --- a/resources/views/fleets/displayfleets.blade.php +++ b/resources/views/fleets/displayfleets.blade.php @@ -2,11 +2,16 @@ @section('content')

Fleets

+ @if(isset($error)) + + @endif + @if(isset($data)) @for($i = 0; $i < count($data[0]); $i++) Join {{ $data[2][$i] }}
@if(Auth::user()->character_id == $data[0][$i]) Delete Fleet

@endif @endfor + @endif
@endsection \ No newline at end of file