From 47142af7a07e8bad4b24af455c13e2a0ae07a771 Mon Sep 17 00:00:00 2001
From: lukasolson <olson.lukas@gmail.com>
Date: Tue, 31 Mar 2015 16:07:20 -0700
Subject: [PATCH] Fix boolean and index pattern editors in advanced settings.

---
 src/kibana/plugins/settings/sections/advanced/index.js        | 2 +-
 .../plugins/settings/sections/advanced/lib/get_val_type.js    | 2 +-
 .../plugins/settings/sections/advanced/lib/get_val_type.js    | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/kibana/plugins/settings/sections/advanced/index.js b/src/kibana/plugins/settings/sections/advanced/index.js
index 8c5f8f210cbd..bc041329fd45 100644
--- a/src/kibana/plugins/settings/sections/advanced/index.js
+++ b/src/kibana/plugins/settings/sections/advanced/index.js
@@ -47,7 +47,7 @@ define(function (require) {
 
             var editor = getEditorType(conf);
             conf.json = editor === 'json';
-            conf.bool = editor === 'bool';
+            conf.bool = editor === 'boolean';
             conf.array = editor === 'array';
             conf.normal = editor === 'normal';
             conf.tooComplex = !editor;
diff --git a/src/kibana/plugins/settings/sections/advanced/lib/get_val_type.js b/src/kibana/plugins/settings/sections/advanced/lib/get_val_type.js
index 2ba250c72cf8..08ea1dd483de 100644
--- a/src/kibana/plugins/settings/sections/advanced/lib/get_val_type.js
+++ b/src/kibana/plugins/settings/sections/advanced/lib/get_val_type.js
@@ -15,7 +15,7 @@ define(function (require) {
       return 'array';
     }
 
-    return (typeof def.value);
+    return (def.value != null ? typeof def.value : typeof value);
   }
 
   return getValType;
diff --git a/test/unit/specs/plugins/settings/sections/advanced/lib/get_val_type.js b/test/unit/specs/plugins/settings/sections/advanced/lib/get_val_type.js
index 5d64ae59f61d..1d0f4a258fa2 100644
--- a/test/unit/specs/plugins/settings/sections/advanced/lib/get_val_type.js
+++ b/test/unit/specs/plugins/settings/sections/advanced/lib/get_val_type.js
@@ -26,6 +26,10 @@ define(function (require) {
           expect(getValType({value: 'someString'})).to.be('string');
           expect(getValType({value: 'someString'}, 42)).to.be('string');
         });
+
+        it('should return the type of the value if the default value is null', function () {
+          expect(getValType({value: null}, 'someString')).to.be('string');
+        });
       });
     });
   });