Fix default selection for 'App.select_tag()' and 'App.select_hash()'.

1 files changed, 6 insertions, 2 deletions

diff --git a/js/App.js b/js/App.js
index e305ce998..378be5f83 100644
--- a/js/App.js
+++ b/js/App.js
@@ -71,16 +71,20 @@ const App = {
                      ${this.attributes_to_string(attributes)} id="${App.escapeHtml(id)}">`
       },
       select_tag: function(name, value, values = [], attributes = {}, id = "") {
+         value = String(value);
+
          return `
             <select name="${name}" dojoType="fox.form.Select" id="${App.escapeHtml(id)}" ${this.attributes_to_string(attributes)}>
-               ${values.map((v) =>
+               ${values.map((v) => {
+                  v = String(v);
                   `<option ${v === value ? 'selected="selected"' : ''} value="${App.escapeHtml(v)}">${App.escapeHtml(v)}</option>`
-               ).join("")}
+               }).join("")}
             </select>
          `
       },
       select_hash: function(name, value, values = {}, attributes = {}, id = "", params = {}) {
 			let keys = Object.keys(values);
+			value = String(value);
 
 			if (params.numeric_sort)
 				keys = keys.sort((a,b) => a - b);