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 branch 'develop'

Browse source
This commit is contained in:
snipe 2018-02-02 09:42:50 -06:00
parent 8491e57258 813106efd3
commit 1e1362bdbc
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1130,12 +1130,14 @@ class AssetsController extends Controller
if ($request->has('warranty_months')) { if ($request->has('warranty_months')) {
$update_array['warranty_months'] = $request->input('warranty_months'); $update_array['warranty_months'] = $request->input('warranty_months');
} }
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')) if (($request->has('update_real_loc'))
&& (($request->input('update_real_loc')) == '1')) && (($request->input('update_real_loc')) == '1'))
{ {
$update_array['location_id'] = $request->input('location_id'); $update_array['location_id'] = $request->input('rtd_location_id');
} }
} }

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

@ -61,9 +61,9 @@
</div> </div>
<div class="col-sm-9"> <div class="col-sm-9">
<div class="checkbox"> <div class="checkbox">
<label for="activated"> <label for="update_real_loc">
{{ Form::radio('update_real_loc', '', true) }} Update default location AND actual location <br> {{ Form::radio('update_real_loc', '1', Input::old('update_real_loc')) }} Update default location AND actual location <br>
{{ Form::radio('update_real_loc', '1', Input::old('activated')) }} Only update default location<br> {{ Form::radio('update_real_loc', '0', true, Input::old('update_real_loc')) }} Only update default location<br>
</label> </label>
</div> </div>