beenull/ctrlpanel
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix role search

Browse source
This commit is contained in:
Ferks-FK 2023-10-28 11:59:00 -04:00
parent 654932225a
commit f3a341fa1b
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/Http/Controllers/Admin/RoleController.php
View file

@ -182,8 +182,7 @@ class RoleController extends Controller
*/ */
public function dataTable() public function dataTable()
{ {
$query = Role::query()->withCount(['users', 'permissions']); $query = Role::query()->withCount(['users', 'permissions'])->get();
return datatables($query) return datatables($query)
->editColumn('id', function (Role $role) { ->editColumn('id', function (Role $role) {
@ -205,17 +204,15 @@ class RoleController extends Controller
->editColumn('name', function (Role $role) { ->editColumn('name', function (Role $role) {
return "<span style='background-color: $role->color' class='badge'>$role->name</span>"; return "<span style='background-color: $role->color' class='badge'>$role->name</span>";
}) })
->editColumn('usercount', function ($query) { ->editColumn('users_count', function ($query) {
return $query->users_count; return $query->users_count;
}) })
->editColumn('permissionscount', function ($query){ ->editColumn('permissions_count', function ($query){
return $query->permissions_count; return $query->permissions_count;
}) })
->editColumn('power', function (Role $role){ ->editColumn('power', function (Role $role){
return $role->power; return $role->power;
}) })
->orderColumn('usercount', 'users_count $1')
->orderColumn('permissionscount', 'permissions_count $1')
->rawColumns(['actions', 'name']) ->rawColumns(['actions', 'name'])
->make(true); ->make(true);
} }

10
themes/default/views/admin/roles/index.blade.php
View file

@ -1,16 +1,16 @@
@extends('layouts.main') @extends('layouts.main')
@section('content') @section('content')
<div class="main py-4"> <div class="py-4 main">
@can('admin.roles.write') @can('admin.roles.write')
<div class="d-flex justify-content-end my-3"> <div class="my-3 d-flex justify-content-end">
<a href="{{route('admin.roles.create')}}" class="btn btn-primary"><i <a href="{{route('admin.roles.create')}}" class="btn btn-primary"><i
class="fa fas fa-shield-alt pe-2"></i>{{__('Create role')}}</a> class="fa fas fa-shield-alt pe-2"></i>{{__('Create role')}}</a>
</div> </div>
@endcan @endcan
<div class="card card-body border-0 shadow table-wrapper table-responsive"> <div class="border-0 shadow card card-body table-wrapper table-responsive">
<h2 class="mb-4 h5">{{ __('Roles') }}</h2> <h2 class="mb-4 h5">{{ __('Roles') }}</h2>
<div class="card-body table-responsive"> <div class="card-body table-responsive">
@ -48,8 +48,8 @@
columns: [ columns: [
{data: 'id'}, {data: 'id'},
{data: 'name'}, {data: 'name'},
{data: 'usercount'}, {data: 'users_count'},
{data: 'permissionscount'}, {data: 'permissions_count'},
{data: 'power'}, {data: 'power'},
{data: 'actions' , sortable : false}, {data: 'actions' , sortable : false},
], ],