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

Merge pull request #10777 from snipe/added_remote_to_bulk_user_edit

Browse source 
Add remote user setting to bulk edit
This commit is contained in:
snipe 2022-03-04 10:35:07 -08:00 committed by GitHub
parent 0dfc27f56e 9a358087ec
commit 1dabd6cc71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Users/BulkUsersController.php
View file

@ -90,7 +90,9 @@ class BulkUsersController extends Controller
->conditionallyAddItem('department_id')
->conditionallyAddItem('company_id')
->conditionallyAddItem('locale')
->conditionallyAddItem('remote')
->conditionallyAddItem('activated');
// If the manager_id is one of the users being updated, generate a warning.
if (array_search($request->input('manager_id'), $user_raw_array)) {
$manager_conflict = true;

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

@ -36,5 +36,6 @@ return [
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'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',
];

17
resources/views/users/bulk-edit.blade.php
View file

@ -63,6 +63,23 @@
</div>
</div>
<!-- remote -->
<div class="form-group">
<div class="col-sm-3 control-label">
{{ trans('admin/users/general.remote') }}
</div>
<div class="col-sm-9">
<div class="checkbox">
<label for="remote">
{{ Form::radio('remote', '', true, ['aria-label'=>'remote']) }} {{ trans('general.do_not_change') }} <br>
{{ Form::radio('remote', '1', old('remote'), ['aria-label'=>'remote']) }} {{ trans('admin/users/general.remote_label') }}<br>
{{ Form::radio('remote', '0', old('remote'), ['aria-label'=>'remote']) }} {{ trans('admin/users/general.not_remote_label') }}
</label>
</div>
</div>
</div> <!--/form-group-->
<!-- activated -->
<div class="form-group">
<div class="col-sm-3 control-label">