From 4e5b8fa2136b79f398bca387f6b37740e482e17f Mon Sep 17 00:00:00 2001 From: akemidx Date: Wed, 1 Feb 2023 16:05:50 -0500 Subject: [PATCH] fixing pr --- app/Http/Controllers/Api/UsersController.php | 1 - app/Http/Controllers/Users/UsersController.php | 1 - app/Models/User.php | 1 - app/Presenters/UserPresenter.php | 9 --------- resources/lang/en/admin/users/general.php | 3 --- resources/views/users/edit.blade.php | 13 ------------- 6 files changed, 28 deletions(-) diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 8185583868..cca829c23f 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -246,7 +246,6 @@ class UsersController extends Controller 'two_factor_optin', 'two_factor_enrolled', 'remote', - 'vipuser', 'start_date', 'end_date', ]; diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php index 9d322ca4d9..52d423036f 100755 --- a/app/Http/Controllers/Users/UsersController.php +++ b/app/Http/Controllers/Users/UsersController.php @@ -271,7 +271,6 @@ class UsersController extends Controller $user->activated = $request->input('activated', 0); $user->zip = $request->input('zip', null); $user->remote = $request->input('remote', 0); - $user->vipuser = $request->input('vipuser', 0); $user->website = $request->input('website', null); $user->start_date = $request->input('start_date', null); $user->end_date = $request->input('end_date', null); diff --git a/app/Models/User.php b/app/Models/User.php index b51d23626f..87a0ef0916 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -62,7 +62,6 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo 'start_date', 'end_date', 'scim_externalid', - 'vipuser', ]; protected $casts = [ diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php index dc41050f5b..8f5cfcccf5 100644 --- a/app/Presenters/UserPresenter.php +++ b/app/Presenters/UserPresenter.php @@ -85,15 +85,6 @@ class UserPresenter extends Presenter 'visible' => true, 'formatter' => 'usersLinkFormatter', ], - [ - 'field' => 'vipuser', - 'searchable' => false, - 'sortable' => true, - 'switchable' => true, - 'title' => trans('admin/users/general.vip_label'), - 'visible' => false, - 'formatter' => 'trueFalseFormatter', - ], [ 'field' => 'remote', 'searchable' => false, diff --git a/resources/lang/en/admin/users/general.php b/resources/lang/en/admin/users/general.php index 241667c387..8d890d6c08 100644 --- a/resources/lang/en/admin/users/general.php +++ b/resources/lang/en/admin/users/general.php @@ -41,6 +41,3 @@ return [ 'remote' => 'Remote', 'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.', 'not_remote_label' => 'This is not a remote user', - 'vip_label' => 'VIP user', - 'vip_help' => 'This can be helpful to mark important people if you would like', -]; diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index b06dcad237..93b8fb7a21 100755 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -362,19 +362,6 @@ @include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.end_date'), 'fieldname' => 'end_date', 'item' => $user]) - -
-
- -

{{ trans('admin/users/general.vip_help') }} -

-
-
-