X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fweb_graph%2Fstatic%2Fsrc%2Fjs%2Fgraph.js;h=f153a2155f03473cf78c7391c65b6afa061e0902;hb=b9a290a38bb159967b5032cbbb2759ee09239c6f;hp=1c286795a91023dc924c3a90e7389167b1ae1a31;hpb=387c476a1defefbd2d65e11561b9b458fbdd5436;p=odoo%2Fodoo.git diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js index 1c28679..f153a21 100644 --- a/addons/web_graph/static/src/js/graph.js +++ b/addons/web_graph/static/src/js/graph.js @@ -398,23 +398,24 @@ openerp.web_graph.GraphView = openerp.web.View.extend({ id = id[0]; } - var record_id = this.abscissa; - var modes = ["list", "form", "graph"]; - var views = []; - _.each(modes, function(mode) { - var view = [false, mode]; - if (self.fields.views && self.fields.views[mode]) { - view.push(self.fields.views[mode]); + var views; + if (this.widget_parent.action) { + views = this.widget_parent.action.views; + if (!_(views).detect(function (view) { + return view[1] === 'list' })) { + views = [[false, 'list']].concat(views); } - views.push(view); - }); + } else { + views = _(["list", "form", "graph"]).map(function(mode) { + return [false, mode]; + }); + } this.do_action({ - "res_model" : this.dataset.model, - "domain" : [[record_id, '=', id], ['id','in',this.dataset.ids]], - "views" : views, - "type" : "ir.actions.act_window", - "view_type" : "list", - "view_mode" : "list" + res_model : this.dataset.model, + domain: [[this.abscissa, '=', id], ['id','in',this.dataset.ids]], + views: views, + type: "ir.actions.act_window", + flags: {default_view: 'list'} }); },