A free open source IT asset/license management system
Made user counts searchable
snipeb9f6b2bbb871
diff --git a/app/Models/User.php b/app/Models/User.phpindex 28df782be8..32c89d1f40 100644--- a/app/Models/User.php+++ b/app/Models/User.php@@ -170,6 +170,16 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo'adminuser' => ['first_name', 'last_name', 'display_name'],];+ protected $searchableCounts = [+ 'accessories_count',+ 'assets_count',+ 'licenses_count',+ 'consumables_count',+ 'accessories_count',+ 'manages_users_count',+ 'manages_locations_count',+ ];+/*** This sets the name property on the user. It's not a real field in the database* (since we use first_name and last_name), but the Laravel mailable methoddiff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.phpindex 9fea331323..838a21d724 100644--- a/app/Presenters/UserPresenter.php+++ b/app/Presenters/UserPresenter.php@@ -248,7 +248,7 @@ class UserPresenter extends Presenter],['field' => 'assets_count',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'escape' => true,@@ -259,7 +259,7 @@ class UserPresenter extends Presenter],['field' => 'licenses_count',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'class' => 'css-license',@@ -269,7 +269,7 @@ class UserPresenter extends Presenter],['field' => 'consumables_count',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'class' => 'css-consumable',@@ -279,7 +279,7 @@ class UserPresenter extends Presenter],['field' => 'accessories_count',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'class' => 'css-accessory',@@ -289,7 +289,7 @@ class UserPresenter extends Presenter],['field' => 'manages_users_count',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'class' => 'css-users',@@ -299,7 +299,7 @@ class UserPresenter extends Presenter],['field' => 'manages_locations_count',- 'searchable' => false,+ 'searchable' => true,'sortable' => true,'switchable' => true,'class' => 'css-location',