Allow sorting on asset counts, disable delete button if the user has items checked out to them

2017-10-19 17:15:21 -07:00
parent f757da1a98
commit 22e13cd4d2
3 changed files with 7 additions and 6 deletions
@@ -92,7 +92,8 @@ class UsersController extends Controller
                    [
                        'last_name','first_name','email','jobtitle','username','employee_num',
                        'assets','accessories', 'consumables','licenses','groups','activated','created_at',
-                        'two_factor_enrolled','two_factor_optin','last_login'
+                        'two_factor_enrolled','two_factor_optin','last_login', 'assets_count', 'licenses_count',
+                        'consumables_count', 'accessories_count'
                    ];

                $sort = in_array($request->get('sort'), $allowed_columns) ? $request->get('sort') : 'first_name';