diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index 3b3755767..99706adae 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -29,30 +29,30 @@ class AuthServiceProvider extends ServiceProvider
*/
public function boot(GateContract $gate)
{
+
+ /*
$this->registerPolicies($gate);
$gate->define('isAdmin', function($user) {
- $permission = false;
$perms = UserPermission::where('character_id', auth()->user()->character_id)->get(['permission']);
foreach($perms as $perm) {
if($perm === 'role.admin') {
- $permission = true;
+ return true;
}
}
- return $permission;
+ return false;
});
$gate->define('isDirector', function($user) {
- $permission = false;
$perms = UserPermission::where('character_id', auth()->user()->character_id)->get(['permission']);
foreach($perms as $perm) {
if($perm === 'role.director') {
- $permission = true;
+ return true;
}
}
- return $permission;
+ return false;
});
$gate->define('isUser', function($user) {
@@ -90,5 +90,6 @@ class AuthServiceProvider extends ServiceProvider
return $permission;
});
+ */
}
}
diff --git a/app/User.php b/app/User.php
index 5d321a342..d158f57e4 100644
--- a/app/User.php
+++ b/app/User.php
@@ -52,10 +52,6 @@ class User extends Authenticatable
return User::where('user_type')->get();
}
- public function role() {
- return $this->hasOne('App\Models\User\UserRole', 'character_id');
- }
-
public function permissions() {
return $this->hasMany('App\Models\User\UserPermission', 'character_id');
}
@@ -70,11 +66,13 @@ class User extends Authenticatable
public function hasPermission($permission) {
$found = UserPermission::where(['character_id' => $this->character_id, 'permission' => $permission])->get(['permission']);
- if(isset($found[0]->permission) && $found[0]->permission == $permission) {
- return true;
- } else {
- return false;
+ foreach($found as $foo) {
+ if($foo->permission === $permission) {
+ return true;
+ }
}
+
+ return false;
}
public function tickets() {
diff --git a/resources/views/layouts/navbar.blade.php b/resources/views/layouts/navbar.blade.php
index 7ca85f88b..359e86160 100644
--- a/resources/views/layouts/navbar.blade.php
+++ b/resources/views/layouts/navbar.blade.php
@@ -8,20 +8,20 @@