Don't populate Manufacturer and Model text input values. Initially set to disabled and if hidden, set back to disabled so that value doesn't get submitted. Prevents it from overriding selected ManufacturerId or ModelId. Fixes #4533

Author: connortechnology

web/skins/classic/views/js/monitor.js

@@ -761,9 +761,11 @@ function populate_models(ManufacturerId) {
 function ManufacturerId_onchange(ManufacturerId_select) {
   if (ManufacturerId_select.value) {
     ManufacturerId_select.form.elements['newMonitor[Manufacturer]'].style['display'] = 'none';
+    ManufacturerId_select.form.elements['newMonitor[Manufacturer]'].disabled = true;
     populate_models(ManufacturerId_select.value);
   } else {
-    ManufacturerId_select.form.elements['newMonitor[Manufacturer]'].style['display'] = 'inline';
+    ManufacturerId_select.form.elements['newMonitor[Manufacturer]'].style['display'] = '';
+    ManufacturerId_select.form.elements['newMonitor[Manufacturer]'].disabled = false;
     // Set models dropdown to Unknown, text area visible
     const ModelId_dropdown = $j('[name="newMonitor[ModelId]"]');
     ModelId_dropdown.empty();
@@ -800,9 +802,9 @@ function Manufacturer_onchange(input) {
 
 function ModelId_onchange(ModelId_select) {
   if (parseInt(ModelId_select.value)) {
-    $j('[name="newMonitor[Model]"]').hide();
+    $j('[name="newMonitor[Model]"]').hide().prop('disabled', true);
   } else {
-    $j('[name="newMonitor[Model]"]').show();
+    $j('[name="newMonitor[Model]"]').show().prop('disabled', false);
   }
 }
 

web/skins/classic/views/monitor.php

@@ -513,7 +513,7 @@ class="nav-link<?php echo ($tab == $name ? ' active' : '') . ' ' . (($name == 'z
                   <input type="text" name="newMonitor[Manufacturer]"
                     placeholder="enter new manufacturer name"
                     autocomplete="new_manufacturer"
-                    value="<?php echo $monitor->Manufacturer()->Name() ?>"<?php echo $monitor->ManufacturerId() ? ' style="display:none"' : '' ?>
+                    <?php echo $monitor->ManufacturerId() ? ' style="display:none" disabled="disabled"' : '' ?>
                     data-on-input-this="Manufacturer_onchange"
                   />
               </li>
@@ -539,7 +539,7 @@ class="nav-link<?php echo ($tab == $name ? ' active' : '') . ' ' . (($name == 'z
                   <input type="text" name="newMonitor[Model]"
                     placeholder="enter new model name"
                     autocomplete="new_model"
-                    value="<?php echo $monitor->Model()->Name() ?>"<?php echo $monitor->ModelId() ? ' style="display:none"' : '' ?>
+                    <?php echo $monitor->ModelId() ? ' style="display:none" disabled="disabled"' : '' ?>
                     data-on-input-this="Model_onchange"
                     />
               </li>