summaryrefslogtreecommitdiff
path: root/addons/web_graph/static/src/js/graph_view.js
diff options
context:
space:
mode:
authorGéry Debongnie <ged@odoo.com>2014-10-07 16:41:39 +0200
committerGéry Debongnie <ged@odoo.com>2014-10-21 09:33:51 +0200
commita8bd1fa8ba32835eae5fba29e5679172eb793556 (patch)
tree173e9a26ad101833728e96060ccbc3b9e3b3e2d3 /addons/web_graph/static/src/js/graph_view.js
parent16aff1132baa2e3c32b05d8f4aad6e0cf11aeb2f (diff)
[IMP] some cleanups in graph/kanban views
notable: disable the group by integration in graph view, because of crash (the search view was rewritten and too much search logic was in the graph view. This is a temporary measure, the graph view will be split into pivot/graph views, and the search integration will be done correctly in the near future.
Diffstat (limited to 'addons/web_graph/static/src/js/graph_view.js')
-rw-r--r--addons/web_graph/static/src/js/graph_view.js12
1 files changed, 4 insertions, 8 deletions
diff --git a/addons/web_graph/static/src/js/graph_view.js b/addons/web_graph/static/src/js/graph_view.js
index dd4ba800245..92429628107 100644
--- a/addons/web_graph/static/src/js/graph_view.js
+++ b/addons/web_graph/static/src/js/graph_view.js
@@ -114,12 +114,8 @@ instance.web_graph.GraphView = instance.web.View.extend({
this.widget_config.measures = measures;
}
this.graph_widget = new openerp.web_graph.Graph(this, this.model, domain, this.widget_config);
- this.graph_widget.appendTo(this.$el);
- this.ViewManager.on('switch_mode', this, function (e) {
- if (e === 'graph') {
- var group_bys = self.get_groupbys_from_searchview();
- this.graph_widget.set(domain, group_bys.group_by, group_bys.col_group_by, group_bys.measures);
- }
+ this.graph_widget.appendTo(this.$el).done(function () {
+
});
return;
}
@@ -226,7 +222,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
return {
category:'GroupBy',
values: this.make_groupby_values(groupbys, 'group_by'),
- icon:'w',
+ icon:'fa fa-bars',
field: this.search_view._s_groupby
};
},
@@ -235,7 +231,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
return {
category:'ColGroupBy',
values: this.make_groupby_values(groupbys, 'col_group_by'),
- icon:'f',
+ icon:'fa fa-bars fa-rotate-90',
field: this.col_search_field
};
},