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