Use c3 names configuration to prevent name clashes

review33311002
issue5523

src/view/graph.js

@@ -93,11 +93,13 @@
 
             this.ids = {};
             data.columns = [['labels']];
+            data.names = {};
             var key2columns = {};
             var fields2load = [this.xfield.name];
             for (i = 0, len = this.yfields.length; i < len; i++) {
                 yfield = this.yfields[i];
-                data.columns.push([yfield.string]);
+                data.columns.push([yfield.name]);
+                data.names[yfield.name] = yfield.string;
                 key2columns[yfield.key || yfield.name] = i + 1;
                 fields2load.push(yfield.name);
             }
@@ -106,7 +108,7 @@
             var set_data = function(index) {
                 return function () {
                     record = group[index];
-                    var x = record.field_get(this.xfield.name);
+                    var x = record.field_get_client(this.xfield.name);
                     data.columns[0][index + 1] = x;
                     this._add_id(x, record.id);
 
@@ -260,7 +262,7 @@
         _chart_type: 'pie',
         _c3_config: function(data) {
             var config = Sao.View.Graph.Pie._super._c3_config.call(this, data);
-            var pie_columns = [];
+            var pie_columns = [], pie_names = {};
             var i, len;
             var labels, values;
 
@@ -296,10 +298,12 @@
                 if (format_func) {
                     label = format_func(label);
                 }
-                pie_columns.push([label, values[i]]);
+                pie_columns.push([i, values[i]]);
+                pie_names[i] = label;
             }
 
             config.data.columns = pie_columns;
+            config.data.names = pie_names;
             return config;
         },
         _add_id: function(key, id) {