From 14bd2d8fb55b9efd7ef4d3be0d3f6d480548db5f Mon Sep 17 00:00:00 2001
From: drkthunder02 <mancuso.christopher@gmail.com>
Date: Wed, 5 Dec 2018 14:22:59 -0600
Subject: [PATCH] updated navbar to have correct logistics section. updated
 user model hasPermission function

---
 app/User.php                             | 14 +++-----------
 resources/views/layouts/navbar.blade.php |  2 +-
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/app/User.php b/app/User.php
index dca96d580..febddd91e 100644
--- a/app/User.php
+++ b/app/User.php
@@ -62,20 +62,12 @@ class User extends Authenticatable
         return $this->hasOne('App\Models\EsiToken', 'character_id', 'character_id');
     }
 
-    public function hasPermission($permission, $perm = true) {
+    public function hasPermission($permission) {
         //Check if the user has a specific permission
         if(UserPermission::where(['character_id' => $this->character_id, 'permission' => $permission])->get()) {
-            if($perm === true) {
-                return true;
-            } else {
-                return false;
-            }
+            return true;
         } else {
-            if($perm === true) {
-                return true;
-            } else {
-                return false;
-            }
+            return false;
         }
     }
 
diff --git a/resources/views/layouts/navbar.blade.php b/resources/views/layouts/navbar.blade.php
index f34902915..dd57e2c63 100644
--- a/resources/views/layouts/navbar.blade.php
+++ b/resources/views/layouts/navbar.blade.php
@@ -40,7 +40,7 @@
             </li>
             @if(Auth()->user()->hasPermission('logistics.minion'))
             <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdoownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Fleet</a>
+                <a class="nav-link dropdown-toggle" href="#" id="navbarDropdoownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Logistics</a>
                 <div class="dropdown-menu" aria-labelledby="navbarDropDownMenuLink">
                     <a class="dropdown-item" href="/logistics/contracts/available">Available Contracts</a>
                     <a class="dropdown-item" href="/logistics/contracts/completed">Completed Contracts</a>