added new features to the admin panel

This commit is contained in:
2019-05-20 01:16:39 -05:00
parent 96f8fa3375
commit ab7410a02b
2 changed files with 5 additions and 5 deletions

View File

@@ -89,13 +89,13 @@ class AdminController extends Controller
*/ */
$usersTable = User::orderBy('name', 'desc')->get()->toArray(); $usersTable = User::orderBy('name', 'desc')->get()->toArray();
foreach($usersTable as $user) { foreach($usersTable as $user) {
$permissions = UserPermission::where([ $perms = UserPermission::where([
'character_id' => $user['character_id'], 'character_id' => $user['character_id'],
])->get()->toArray(); ])->get('permission')->toArray();
$tempUser['name'] = $user['name']; $tempUser['name'] = $user['name'];
$tempUser['role'] = $user['user_type']; $tempUser['role'] = $user['user_type'];
$tempUser['permissions'] = $permissions; $tempUser['permissions'] = $perms;
array_push($userArr, $tempUser); array_push($userArr, $tempUser);
} }

View File

@@ -7,7 +7,7 @@
<br> <br>
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="nav-item active"><a class="nav-link active" data-toggle="tab" href="#user">User</a></li> <li class="nav-item active"><a class="nav-link active" data-toggle="tab" href="#user">User</a></li>
<li class="nav-item"><a class="nav-link" data-toggle="tab" href="#userTable">User Table</a></li> <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#table">User Table</a></li>
<li class="nav-item"><a class="nav-link" data-toggle="tab" href="#permissions">Permissions</a></li> <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#permissions">Permissions</a></li>
<li class="nav-item"><a class="nav-link" data-toggle="tab" href="#roles">Roles</a></li> <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#roles">Roles</a></li>
<li class="nav-item"><a class="nav-link" data-toggle="tab" href="#logins">Login</a></li> <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#logins">Login</a></li>
@@ -36,7 +36,7 @@
</div> </div>
</div> </div>
</div> </div>
<div id="userTable" class="tab-pane fade"> <div id="table" class="tab-pane fade">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<table class="table table-striped"> <table class="table table-striped">