lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

adds an option to bulk edit actual location for bulk edit and fixes update issue

Browse source
This commit is contained in:
Godfrey M 2023-09-11 11:21:56 -07:00
parent c0cbdb1fc4
commit e73b16846e
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/Assets/BulkAssetsController.php
View file

@ -189,9 +189,15 @@ class BulkAssetsController extends Controller
} }
if ($request->filled('rtd_location_id')) { if ($request->filled('rtd_location_id')) {
if (($request->filled('update_real_loc')) && (($request->input('update_real_loc')) == '0')) {
$this->update_array['rtd_location_id'] = $request->input('rtd_location_id'); $this->update_array['rtd_location_id'] = $request->input('rtd_location_id');
}
if (($request->filled('update_real_loc')) && (($request->input('update_real_loc')) == '1')) { if (($request->filled('update_real_loc')) && (($request->input('update_real_loc')) == '1')) {
$this->update_array['location_id'] = $request->input('rtd_location_id'); $this->update_array['location_id'] = $request->input('rtd_location_id');
$this->update_array['rtd_location_id'] = $request->input('rtd_location_id');
}
if (($request->filled('update_real_loc')) && (($request->input('update_real_loc')) == '2')) {
$this->update_array['location_id'] = $request->input('rtd_location_id');
} }
} }

1
resources/lang/en/admin/hardware/form.php
View file

@ -49,6 +49,7 @@ return [
'asset_location' => 'Update Asset Location', 'asset_location' => 'Update Asset Location',
'asset_location_update_default_current' => 'Update default location AND actual location', 'asset_location_update_default_current' => 'Update default location AND actual location',
'asset_location_update_default' => 'Update only default location', 'asset_location_update_default' => 'Update only default location',
'asset_location_update_actual' => 'Update only actual location',
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.', 'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.', 'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing... (This might take a bit of time on large files)', 'processing_spinner' => 'Processing... (This might take a bit of time on large files)',

4
resources/views/hardware/bulk.blade.php
View file

@ -96,6 +96,10 @@
{{ Form::radio('update_real_loc', '0', old('update_real_loc'), ['aria-label'=>'update_default_loc']) }} {{ Form::radio('update_real_loc', '0', old('update_real_loc'), ['aria-label'=>'update_default_loc']) }}
{{ trans('admin/hardware/form.asset_location_update_default') }} {{ trans('admin/hardware/form.asset_location_update_default') }}
</label> </label>
<label class="form-control">
{{ Form::radio('update_real_loc', '2', old('update_real_loc'), ['aria-label'=>'update_default_loc']) }}
{{ trans('admin/hardware/form.asset_location_update_actual') }}
</label>
</div> </div>
</div> <!--/form-group--> </div> <!--/form-group-->