From 4b3188c111639c197e3e270598aaa72126af53a8 Mon Sep 17 00:00:00 2001
From: Kane York <rikingcoding@gmail.com>
Date: Mon, 14 Sep 2015 16:00:39 -0700
Subject: [PATCH] Fix rendering of columns named topic_id

---
 assets/javascripts/discourse/components/query-result.js.es6   | 4 ++++
 .../javascripts/discourse/components/query-row-content.js.es6 | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/assets/javascripts/discourse/components/query-result.js.es6 b/assets/javascripts/discourse/components/query-result.js.es6
index 9b633e9..6409c8c 100644
--- a/assets/javascripts/discourse/components/query-result.js.es6
+++ b/assets/javascripts/discourse/components/query-result.js.es6
@@ -65,6 +65,10 @@ const QueryResultComponent = Ember.Component.extend({
     });
   }.property('content', 'columns.@each'),
 
+  fallbackTemplate: function() {
+    return this.container.lookup('template:explorer/text.raw');
+  }.property(),
+
   columnTemplates: function() {
     const self = this;
     if (!this.get('columns')) {
diff --git a/assets/javascripts/discourse/components/query-row-content.js.es6 b/assets/javascripts/discourse/components/query-row-content.js.es6
index b1c3e24..bd144e2 100644
--- a/assets/javascripts/discourse/components/query-row-content.js.es6
+++ b/assets/javascripts/discourse/components/query-row-content.js.es6
@@ -27,6 +27,7 @@ const QueryRowContentComponent = Ember.Component.extend({
     const self = this;
     const row = this.get('row');
     const parent = self.get('parent');
+    const fallback = parent.get('fallbackTemplate');
 
     const parts = this.get('columnTemplates').map(function(t, idx) {
       const ctx = {};
@@ -48,7 +49,7 @@ const QueryRowContentComponent = Ember.Component.extend({
         ctx.value = row[idx];
       }
 
-      return new Handlebars.SafeString(t.template(ctx, params));
+      return new Handlebars.SafeString((t.template || fallback)(ctx, params));
     });
 
     buffer.push("<td>" + parts.join("</td><td>") + "</td>");