Fix sys contact null (librenms#18205)

* Fix override sysContact null issue

* Restore the previously set override when enabled.

Author: murrant

app/Http/Controllers/Device/EditDeviceController.php

@@ -68,7 +68,7 @@ public function index(Device $device): View
             'poller_groups' => PollerGroup::orderBy('group_name')->pluck('group_name', 'id'),
             'default_poller_group' => LibrenmsConfig::get('distributed_poller_group'),
             'override_sysContact_bool' => $device->getAttrib('override_sysContact_bool'),
-            'override_sysContact_string' => $device->getAttrib('override_sysContact_bool') ? $device->getAttrib('override_sysContact_string') : $device->sysContact,
+            'override_sysContact_string' => $device->getAttrib('override_sysContact_string'),
             'maintenance' => $isUnderMaintenance,
             'default_maintenance_behavior' => MaintenanceBehavior::from((int) LibrenmsConfig::get('alert.scheduled_maintenance_default_behavior'))->value,
             'exclusive_maintenance_id' => $exclusive_schedule_id,
@@ -95,7 +95,7 @@ public function update(UpdateDeviceRequest $request, Device $device): RedirectRe
         // check if sysContact is overridden
         if ($request->get('override_sysContact')) {
             $device->setAttrib('override_sysContact_bool', true);
-            $device->setAttrib('override_sysContact_string', $request->get('override_sysContact_string', ''));
+            $device->setAttrib('override_sysContact_string', (string) $request->get('override_sysContact_string'));
         } else {
             $device->forgetAttrib('override_sysContact_bool');
         }

resources/views/device/edit/device.blade.php

@@ -112,7 +112,9 @@ class="btn btn-primary" name="rediscover" title="{{ __('device.edit.rediscover_t
                 <div class="col-sm-6">
                     <input id="override_sysContact_string" class="form-control" name="override_sysContact_string" size="32"
                            {{ old('override_sysContact', $override_sysContact_bool) ? '' : 'disabled' }}
-                           value="{{ old('override_sysContact_string', $override_sysContact_string) }}"
+                           data-override="{{ $override_sysContact_string }}"
+                           data-default="{{ $device->sysContact }}"
+                           value="{{ old('override_sysContact_string', $override_sysContact_bool ? $override_sysContact_string : $device->sysContact) }}"
                     />
                 </div>
             </div>
@@ -219,6 +221,14 @@ class="btn btn-primary" name="rediscover" title="{{ __('device.edit.rediscover_t
 @push('scripts')
     <script>
         $('[type="checkbox"]').bootstrapSwitch('offColor', 'danger');
+        $('#override_sysContact').on('switchChange.bootstrapSwitch', function(event, state) {
+            var $input = $('#override_sysContact_string');
+            var newValue = state ? $input.data('override') : $input.data('default');
+
+            if (!state || newValue) {
+                $input.val(newValue);
+            }
+        });
         $("#rediscover").on("click", function() {
                 fetch('{{ route('device.rediscover', [$device->device_id]) }}', {
                     method: 'POST',