From 87a160fb581686d6a8ca653a31600d3e0f84d152 Mon Sep 17 00:00:00 2001
From: drkthunder02 <mancuso.christopher@gmail.com>
Date: Tue, 29 Oct 2019 00:13:36 -0500
Subject: [PATCH] pagination testing

---
 .../Controllers/Dashboard/AdminController.php |  2 +-
 app/Models/User/User.php                      | 28 +++++++++++++++----
 .../admin/dashboards/userspaged.blade.php     |  4 +--
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/Dashboard/AdminController.php b/app/Http/Controllers/Dashboard/AdminController.php
index 30bcfb7db..2c646f481 100644
--- a/app/Http/Controllers/Dashboard/AdminController.php
+++ b/app/Http/Controllers/Dashboard/AdminController.php
@@ -33,7 +33,7 @@ class AdminController extends Controller
 
         foreach($usersArr as $user) {
             $user->role = $user->getRole();
-            $user->permissions = $user->getPermissionsArray();
+            $user['permissions'] = $user->getPermissionsArray();
         }
 
         return view('admin.dashboards.userspaged')->with('usersArr', $usersArr);
diff --git a/app/Models/User/User.php b/app/Models/User/User.php
index a32da8936..01eb9e6e9 100644
--- a/app/Models/User/User.php
+++ b/app/Models/User/User.php
@@ -119,18 +119,34 @@ class User extends Authenticatable
     }
 
     public function getPermissionsArray() {
-        $perms = UserPermission::where([
+        $permCount = UserPermission::where([
             'character_id' => $this->character_id,
-        ])->get('permission')->toArray();
+        ])->count();
 
-        return $perms;
+        if($permCount > 0) {
+            $perms = UserPermission::where([
+                'character_id' => $this->character_id,
+            ])->get('permission')->toArray();
+    
+            return $perms;
+        } else {
+            return null;
+        }        
     }
 
     public function getPermissions() {
-        $perms = UserPermission::where([
+        $permCount = UserPermission::where([
             'character_id' => $this->character_id,
-        ])->get('permission');
+        ])->count();
 
-        return $perms;
+        if($permCount > 0) {
+            $perms = UserPermission::where([
+                'character_id' => $this->character_id,
+            ])->get('permission');
+
+            return $perms;
+        } else {
+            return null;
+        }
     }
 }
diff --git a/resources/views/admin/dashboards/userspaged.blade.php b/resources/views/admin/dashboards/userspaged.blade.php
index ed7edfc8b..102b6b4d4 100644
--- a/resources/views/admin/dashboards/userspaged.blade.php
+++ b/resources/views/admin/dashboards/userspaged.blade.php
@@ -20,9 +20,7 @@
                         <td>{{ $user->role }}</td>
                         <td>
                         @if($user->permission)
-                            @foreach($user->permissions as $perm)
-                                {{ $perm . ", " }}
-                            @endforeach
+                            {{ $user->permission }}
                         @else
                             No Permissions
                         @endif