DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 22:37:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added: ability to change actual location from bulk edit assets

Browse source
This commit is contained in:
snipe 2018-01-24 04:38:25 -08:00
parent 7cafa194c1
commit a7b8b4bf55
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/AssetsController.php
View file

@ -1131,7 +1131,13 @@ class AssetsController extends Controller
} }
if ($request->has('rtd_location_id')) { if ($request->has('rtd_location_id')) {
$update_array['rtd_location_id'] = $request->input('rtd_location_id'); $update_array['rtd_location_id'] = $request->input('rtd_location_id');
if (($request->has('update_real_loc'))
&& (($request->input('update_real_loc')) == '1'))
{
$update_array['location_id'] = $request->input('location_id');
}
} }
if ($request->has('status_id')) { if ($request->has('status_id')) {
$update_array['status_id'] = $request->input('status_id'); $update_array['status_id'] = $request->input('status_id');
} }

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

@ -54,8 +54,25 @@
<!-- Default Location --> <!-- Default Location -->
@include ('partials.forms.edit.location-select', ['translated_name' => trans('admin/hardware/form.default_location'), 'fieldname' => 'rtd_location_id']) @include ('partials.forms.edit.location-select', ['translated_name' => trans('admin/hardware/form.default_location'), 'fieldname' => 'rtd_location_id'])
<!-- Update actual location -->
<div class="form-group">
<div class="col-sm-3 control-label">
<!-- Purchase Cost --> </div>
<div class="col-sm-9">
<div class="checkbox">
<label for="activated">
{{ Form::radio('update_real_loc', '', true) }} Update default location AND actual location <br>
{{ Form::radio('update_real_loc', '1', Input::old('activated')) }} Only update default location<br>
</label>
</div>
</div>
</div> <!--/form-group-->
<!-- Purchase Cost -->
<div class="form-group {{ $errors->has('purchase_cost') ? ' has-error' : '' }}"> <div class="form-group {{ $errors->has('purchase_cost') ? ' has-error' : '' }}">
<label for="purchase_cost" class="col-md-3 control-label"> <label for="purchase_cost" class="col-md-3 control-label">
{{ trans('admin/hardware/form.cost') }} {{ trans('admin/hardware/form.cost') }}