From 08d129c2ea4393e9468f57123a760f2f277f5346 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 2 Feb 2018 09:36:40 -0600
Subject: [PATCH 1/2] Fixed #4951 - updating asset location in bulk edit

---
 app/Http/Controllers/AssetsController.php | 4 +++-
 resources/views/hardware/bulk.blade.php   | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index 875243d0d..e65025ae1 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -1130,12 +1130,14 @@ class AssetsController extends Controller
                     if ($request->has('warranty_months')) {
                         $update_array['warranty_months'] =  $request->input('warranty_months');
                     }
+
+
                     if ($request->has('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');
+                            $update_array['location_id'] = $request->input('rtd_location_id');
                         }
                     }
                     
diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php
index 8207e9571..079cb0c3f 100755
--- a/resources/views/hardware/bulk.blade.php
+++ b/resources/views/hardware/bulk.blade.php
@@ -62,8 +62,8 @@
             <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>
+                  {{ Form::radio('update_real_loc', '1', true) }} Update default location AND actual location <br>
+                  {{ Form::radio('update_real_loc', '0', Input::old('activated')) }} Only update default location<br>
 
                 </label>
               </div>

From 813106efd3cbf86be489865c438cc09cc41ba77a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 2 Feb 2018 09:42:34 -0600
Subject: [PATCH 2/2] Default to only changing default location in bulk edit

---
 resources/views/hardware/bulk.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php
index 079cb0c3f..8c0908c0c 100755
--- a/resources/views/hardware/bulk.blade.php
+++ b/resources/views/hardware/bulk.blade.php
@@ -61,9 +61,9 @@
             </div>
             <div class="col-sm-9">
               <div class="checkbox">
-                <label for="activated">
-                  {{ Form::radio('update_real_loc', '1', true) }} Update default location AND actual location <br>
-                  {{ Form::radio('update_real_loc', '0', Input::old('activated')) }} Only update default location<br>
+                <label for="update_real_loc">
+                  {{ Form::radio('update_real_loc', '1', Input::old('update_real_loc')) }} Update default location AND actual location <br>
+                  {{ Form::radio('update_real_loc', '0', true, Input::old('update_real_loc')) }} Only update default location<br>
 
                 </label>
               </div>