From 0fa172a4ef6ed365faf8622b0e13c269985bb18b Mon Sep 17 00:00:00 2001
From: seefo <robbie.uvanni@gmail.com>
Date: Wed, 14 Jun 2017 17:17:00 -0700
Subject: [PATCH] Fixed default value bug in dropdowns inside domain server
 settings

---
 domain-server/resources/describe-settings.json      |  1 +
 domain-server/resources/web/settings/js/settings.js | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index e9327d6a66..020262ca13 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -1362,6 +1362,7 @@
               "label": "Server Type",
               "type": "select",
               "placeholder": "Audio Mixer",
+              "default": "Audio Mixer",
               "can_set": true,
               "options": [               
                 {
diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index c48096c097..2947983ef9 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -1294,12 +1294,12 @@ function makeTableHiddenInputs(setting, initialValues, categoryValue) {
         html += "<select style='display: none;' class='form-control' data-hidden-input='" + col.name + "'>'"
         
         for (var i in col.options) {
-            var option = col.options[i];           
+            var option = col.options[i];
             html += "<option value='" + option.value + "' " + (option.value == defaultValue ? 'selected' : '') + ">" + option.label + "</option>";
         }
         
-        html += "</select>";    
-        html += "<input type='hidden' class='table-dropdown form-control trigger-change' name='" + col.name + "' value='" + option.value + "'></td>";      
+        html += "</select>";
+        html += "<input type='hidden' class='table-dropdown form-control trigger-change' name='" + col.name + "' value='" +  defaultValue + "'></td>";
     } else {
       html +=
         "<td " + (col.hidden ? "style='display: none;'" : "") + " class='" + Settings.DATA_COL_CLASS + "' " +
@@ -1441,8 +1441,11 @@ function addTableRow(row) {
         if (isCheckbox) {
           input.attr("name", newName)
         } else {
-          if (isDropdown) {             
-            $(element).children("select").attr("data-hidden-input", newName);
+          if (isDropdown) {
+            // default values for hidden inputs inside child selects gets cleared so we need to remind it
+            var selectElement = $(element).children("select");
+            selectElement.attr("data-hidden-input", newName);
+            $(element).children("input").val(selectElement.val());
           }
           input.attr("name", newName);
         }