odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] fixes problems due to the preceding merge (resolved conflict was not properly resolved) (addon web_graph) 

bzr revid: ged@openerp.com-20140225103155-9cdbs8p79sa7hkwi
This commit is contained in:
Gery Debongnie 2014-02-25 11:31:55 +01:00
parent 893b7041f9
commit 02b70e2950
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/web_graph/static/src/js/graph_view.js
View File

@ -81,14 +81,9 @@ instance.web_graph.GraphView = instance.web.View.extend({
this.ignore_do_search = false;
return;
}
var self = this,
<<<<<<< TREE
groupbys = this.get_groupbys_dos(),
groupbys = this.get_groupbys_from_searchview(),
col_group_by = groupbys.col_group_by;
=======
col_group_by = self.get_groupbys_from_searchview('ColGroupBy', 'col_group_by');
>>>>>>> MERGE-SOURCE
if (!this.graph_widget) {
if (group_by.length) {
@ -116,7 +111,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
searchdata = this.search_view.build_search_data();
_.each(searchdata.groupbys, function (data) {
data = (_isString(data)) ? py.eval(data) : data;
data = (_.isString(data)) ? py.eval(data) : data;
result.group_by = result.group_by.concat(data.group_by);
if (data.col_group_by) {
result.col_group_by = result.col_group_by.concat(data.col_group_by);