Discource-C
/
discourse-data-explorer
mirror of https://github.com/discourse/discourse-data-explorer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix rendering of columns named topic_id

This commit is contained in:
Kane York 2015-09-14 16:00:39 -07:00
parent 86a3d16ad4
commit 4b3188c111
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/javascripts/discourse/components/query-result.js.es6
View File

@ -65,6 +65,10 @@ const QueryResultComponent = Ember.Component.extend({
}); });
}.property('content', 'columns.@each'), }.property('content', 'columns.@each'),
fallbackTemplate: function() {
return this.container.lookup('template:explorer/text.raw');
}.property(),
columnTemplates: function() { columnTemplates: function() {
const self = this; const self = this;
if (!this.get('columns')) { if (!this.get('columns')) {

3
assets/javascripts/discourse/components/query-row-content.js.es6
View File

@ -27,6 +27,7 @@ const QueryRowContentComponent = Ember.Component.extend({
const self = this; const self = this;
const row = this.get('row'); const row = this.get('row');
const parent = self.get('parent'); const parent = self.get('parent');
const fallback = parent.get('fallbackTemplate');
const parts = this.get('columnTemplates').map(function(t, idx) { const parts = this.get('columnTemplates').map(function(t, idx) {
const ctx = {}; const ctx = {};
@ -48,7 +49,7 @@ const QueryRowContentComponent = Ember.Component.extend({
ctx.value = row[idx]; 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>"); buffer.push("<td>" + parts.join("</td><td>") + "</td>");