From aea893f80dc69291552d5e7cfe7cd769e0bda793 Mon Sep 17 00:00:00 2001
From: drkthunder02 <mancuso.christopher@gmail.com>
Date: Tue, 13 Nov 2018 21:38:15 -0600
Subject: [PATCH] fleets

---
 app/Http/Controllers/FleetsController.php     | 20 +++++++------------
 .../views/fleets/displayfleets.blade.php      |  2 +-
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/app/Http/Controllers/FleetsController.php b/app/Http/Controllers/FleetsController.php
index a84f3c07b..8f2a9cd82 100644
--- a/app/Http/Controllers/FleetsController.php
+++ b/app/Http/Controllers/FleetsController.php
@@ -84,17 +84,14 @@ class FleetsController extends Controller
             ]);
             
             $fleet->SetFleetEndTime($endTime);
-            //Return the view with the success message
-            return view('fleets.displayfleets')->with('success', 'Fleet registered.');
-        } else {
-            //Return the view with the error message of the fleet has been found already.
-            return view('fleets.displayfleets')->with('error', 'Fleet already in the database.');
-        }
+        } 
+
+        return redirect('/fleets/display');
     }
 
     public function deleteFleet($fleetId) {
         DB::table('Fleets')->where('fleet', $fleetId)->delete();
-        return view('fleets.displayfleets')->with('success', 'Fleet deleted.');
+        return redirect('/fleets/display');
     }
 
     public function addPilot($fleetId, $charId) {
@@ -102,11 +99,8 @@ class FleetsController extends Controller
         $fleet = DB::table('Fleets')->where('fleet', $fleetId)->get();
         //Add a pilot to the fleet
         $error = $fleet->AddPilot($fleet->character_id, $charId);
-        if($error) {
-            return view('fleets.displaystanding')->with('error', 'Unable to add to fleet.');
-        } else {
-            return view('fleets.displaystanding')->with('success', 'Pilot added to fleet.');
-        }
+
+        return redirect('/fleets/display');
     }
 
     public function updateFleet() {
@@ -114,6 +108,6 @@ class FleetsController extends Controller
         $fleet = session('fleet');
         $fleet->UpdateFleet($request->isFreeMove, $request->motd);
 
-        return view('fleets.displaystanding')->with('success', 'Fleet updated.');
+        return redirect('/fleets/display');
     }
 }
diff --git a/resources/views/fleets/displayfleets.blade.php b/resources/views/fleets/displayfleets.blade.php
index 1fe32941a..f5381d9d9 100644
--- a/resources/views/fleets/displayfleets.blade.php
+++ b/resources/views/fleets/displayfleets.blade.php
@@ -5,7 +5,7 @@
     @for($i = 0; $i < count($data[0]); $i++)
         <a href="{{ route('addpilot', [$data[1][$i], Auth::user()->character_id]) }}">Join {{ $data[2][$i] }}</a><br>
         @if(Auth::user()->character_id == $data[0][$i])
-        <a href="{{ route('deletefleet', [$data[0][$i]]) }}">Delete Fleet</a><br><br>
+        <a href="{{ route('deletefleet', [$data[1][$i]]) }}">Delete Fleet</a><br><br>
         @endif
     @endfor
 </div>