pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] fixes a crash happening when in dashboards, the graph view was trying to access undefined attributes (addon web_graph)

Browse Source 
bzr revid: ged@openerp.com-20140123113450-ec4fubf1urkdutw7
This commit is contained in:
Gery Debongnie
2014-01-23 12:34:50 +01:00
parent 39e0f4736f
commit b83cfc2c2b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_graph/static/src/js/graph_view.js
+1 -1
View File
@@ -173,7 +173,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
context[category] = groupby.field;
var value;
if (category === 'group_by' && groupby.type !== 'date' && groupby.type !== 'datetime') {
value = groupby.filter;
value = groupby.filter || {attrs: {domain: [], context: context}};
} else {
value = {attrs: {domain: [], context: context}};
}
addons/web_graph/static/src/js/graph_widget.js
+2 -1
View File
@@ -43,6 +43,7 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
return this.model.call('fields_get', []).then(function (f) {
self.fields = f;
self.fields.__count = {field:'__count', type: 'integer', string:'Quantity'};
self.measure_list = self.get_measures();
self.add_measures_to_options();
self.pivot_options.row_groupby = self.create_field_values(self.pivot_options.row_groupby || []);
@@ -87,7 +88,7 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({
// Extracts the integer/float fields which are not 'id'
get_measures: function() {
var measures = [{field:'__count', type: 'integer', string:'Quantity'}];
var measures = [];
_.each(this.fields, function (f, id) {
if (((f.type === 'integer') || (f.type === 'float')) && (id !== 'id')) {
measures.push({field:id, type: f.type, string: f.string});