DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fixing pr

Browse source
This commit is contained in:
akemidx 2023-02-01 16:05:50 -05:00
parent cafe8f3074
commit 4e5b8fa213
6 changed files with 0 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Http/Controllers/Api/UsersController.php
View file

@ -246,7 +246,6 @@ class UsersController extends Controller
'two_factor_optin', 'two_factor_optin',
'two_factor_enrolled', 'two_factor_enrolled',
'remote', 'remote',
'vipuser',
'start_date', 'start_date',
'end_date', 'end_date',
]; ];

1
app/Http/Controllers/Users/UsersController.php
View file

@ -271,7 +271,6 @@ class UsersController extends Controller
$user->activated = $request->input('activated', 0); $user->activated = $request->input('activated', 0);
$user->zip = $request->input('zip', null); $user->zip = $request->input('zip', null);
$user->remote = $request->input('remote', 0); $user->remote = $request->input('remote', 0);
$user->vipuser = $request->input('vipuser', 0);
$user->website = $request->input('website', null); $user->website = $request->input('website', null);
$user->start_date = $request->input('start_date', null); $user->start_date = $request->input('start_date', null);
$user->end_date = $request->input('end_date', null); $user->end_date = $request->input('end_date', null);

1
app/Models/User.php
View file

@ -62,7 +62,6 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
'start_date', 'start_date',
'end_date', 'end_date',
'scim_externalid', 'scim_externalid',
'vipuser',
]; ];
protected $casts = [ protected $casts = [

9
app/Presenters/UserPresenter.php
View file

@ -85,15 +85,6 @@ class UserPresenter extends Presenter
'visible' => true, 'visible' => true,
'formatter' => 'usersLinkFormatter', 'formatter' => 'usersLinkFormatter',
], ],
[
'field' => 'vipuser',
'searchable' => false,
'sortable' => true,
'switchable' => true,
'title' => trans('admin/users/general.vip_label'),
'visible' => false,
'formatter' => 'trueFalseFormatter',
],
[ [
'field' => 'remote', 'field' => 'remote',
'searchable' => false, 'searchable' => false,

3
resources/lang/en/admin/users/general.php
View file

@ -41,6 +41,3 @@ return [
'remote' => 'Remote', '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.', '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', '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',
];

13
resources/views/users/edit.blade.php
View file

@ -362,19 +362,6 @@
@include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.end_date'), 'fieldname' => 'end_date', 'item' => $user]) @include ('partials.forms.edit.datepicker', ['translated_name' => trans('general.end_date'), 'fieldname' => 'end_date', 'item' => $user])
<!-- VIP checkbox -->
<div class="form-group">
<div class="col-md-7 col-md-offset-3">
<label for="vipuser">
<input type="checkbox" value="1" name="vipuser" class="minimal" {{ (old('vipuser', $user->vipuser)) == '1' ? ' checked="checked"' : '' }} aria-label="vipuser">
{{ trans('admin/users/general.vip_label') }}
</label>
<p class="help-block">{{ trans('admin/users/general.vip_help') }}
</p>
</div>
</div>
<!-- remote checkbox --> <!-- remote checkbox -->
<div class="form-group"> <div class="form-group">