From ac3827f700cec89f4603210446394b3b49917081 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 14 Jul 2014 15:15:30 -0400
Subject: [PATCH] FIX: Combobox wasn't matching selected value properly with
 value of 0

---
 app/assets/javascripts/discourse/views/combo-box.js.es6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/views/combo-box.js.es6 b/app/assets/javascripts/discourse/views/combo-box.js.es6
index fb37f5d4659..3b45af4d2f9 100644
--- a/app/assets/javascripts/discourse/views/combo-box.js.es6
+++ b/app/assets/javascripts/discourse/views/combo-box.js.es6
@@ -39,7 +39,7 @@ export default Discourse.View.extend({
       var self = this;
       this.get('content').forEach(function(o) {
         var val = o[self.get('valueAttribute')];
-        if (val) { val = val.toString(); }
+        if (!Em.isNone(val)) { val = val.toString(); }
 
         var selectedText = (val === selected) ? "selected" : "";
         buffer.push("<option " + selectedText + " value=\"" + val + "\" " + self.buildData(o) + ">" + Handlebars.Utils.escapeExpression(Em.get(o, nameProperty)) + "</option>");