Merge branch 'master' of github.com:okfn/recline

2013-02-24 14:36:34 +00:00 · 2013-02-24 14:36:34 +00:00 · 2c3fa289b6
commit 2c3fa289b6
parent 44ec0a3d5c da0e86677c
1 changed files with 2 additions and 1 deletions
--- a/src/view.flot.js
+++ b/src/view.flot.js
@ -313,6 +313,7 @@ my.Flot = Backbone.View.extend({
    var series = [];
    _.each(this.state.attributes.series, function(field) {
      var points = [];
+      var fieldLabel = self.model.fields.get(field).get('label');
      _.each(self.model.records.models, function(doc, index) {
        var xfield = self.model.fields.get(self.state.attributes.group);
        var x = doc.getFieldValue(xfield);
@ -341,7 +342,7 @@ my.Flot = Backbone.View.extend({
      });
      series.push({
        data: points,
-        label: field,
+        label: fieldLabel,
        hoverable: true
      });
    });