Merge pull request #329 from markbrough/master

[flot][xs]: Show field labels rather than id, e.g. on legend.
This commit is contained in:
Rufus Pollock
2013-02-24 05:07:45 -08:00

View File

@@ -313,6 +313,7 @@ my.Flot = Backbone.View.extend({
var series = []; var series = [];
_.each(this.state.attributes.series, function(field) { _.each(this.state.attributes.series, function(field) {
var points = []; var points = [];
var fieldLabel = self.model.fields.get(field).get('label');
_.each(self.model.records.models, function(doc, index) { _.each(self.model.records.models, function(doc, index) {
var xfield = self.model.fields.get(self.state.attributes.group); var xfield = self.model.fields.get(self.state.attributes.group);
var x = doc.getFieldValue(xfield); var x = doc.getFieldValue(xfield);
@@ -341,7 +342,7 @@ my.Flot = Backbone.View.extend({
}); });
series.push({ series.push({
data: points, data: points,
label: field, label: fieldLabel,
hoverable: true hoverable: true
}); });
}); });