From e0bee3a3bc0fe27c81ba0ce30588254eab6a6002 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 13 Nov 2017 18:51:19 -0800
Subject: [PATCH] FIX: mutate value if numeric in enums

---
 .../admin/templates/components/site-settings/enum.hbs       | 2 +-
 app/assets/javascripts/select-box-kit/mixins/utils.js.es6   | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
index 765a0e20d19..9b3da3178e3 100644
--- a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
+++ b/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs
@@ -1,4 +1,4 @@
-{{combo-box valueAttribute="value" content=setting.validValues value=value none=setting.allowsNone}}
+{{combo-box castInteger=true valueAttribute="value" content=setting.validValues value=value none=setting.allowsNone}}
 {{preview}}
 {{setting-validation-message message=validationMessage}}
 <div class='desc'>{{{unbound setting.description}}}</div>
diff --git a/app/assets/javascripts/select-box-kit/mixins/utils.js.es6 b/app/assets/javascripts/select-box-kit/mixins/utils.js.es6
index 3ece47cc3bf..475cf726fcc 100644
--- a/app/assets/javascripts/select-box-kit/mixins/utils.js.es6
+++ b/app/assets/javascripts/select-box-kit/mixins/utils.js.es6
@@ -13,8 +13,12 @@ export default Ember.Mixin.create({
     return content;
   },
 
+  _isNumeric(input) {
+    return !isNaN(parseFloat(input)) && isFinite(input);
+  },
+
   _castInteger(value) {
-    if (this.get("castInteger") === true && Ember.isPresent(value)) {
+    if (this.get("castInteger") === true && Ember.isPresent(value) && this._isNumeric(value)) {
       return parseInt(value, 10);
     }