mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-03-29 11:56:19 +00:00
Code Issues Projects Releases Wiki Activity

Added sortable created_at to assets and users

Browse Source
This commit is contained in:
snipe
2016-06-15 21:06:17 -07:00
parent 27427dd26b
commit 87352470c0
6 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/UsersController.php
View File

@ -887,7 +887,7 @@ class UsersController extends Controller
$allowed_columns =
[
'last_name','first_name','email','username','employee_num',
'assets','accessories', 'consumables','licenses','groups','activated'
'assets','accessories', 'consumables','licenses','groups','activated','created_at'
];
$sort = in_array($sort, $allowed_columns) ? $sort : 'first_name';
@ -946,6 +946,7 @@ class UsersController extends Controller
'consumables' => $user->consumables->count(),
'groups' => $group_names,
'notes' => e($user->notes),
'created_at' => ($user->created_at!='') ? e($user->created_at->format('F j, Y h:iA')) : '',
'activated' => ($user->activated=='1') ? '<i class="fa fa-check"></i>' : '<i class="fa fa-times"></i>',
'actions' => ($actions) ? $actions : '',
'companyName' => is_null($user->company) ? '' : e($user->company->name)