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

[IMP] remove custom implementation of fields_view_get in graph view 

bzr revid: xmo@openerp.com-20110926140241-4xuobnvpncetk7bx
This commit is contained in:
Xavier Morel 2011-09-26 16:02:41 +02:00
parent 211713396a
commit 0a3a7663d1
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/web_graph/__init__.py
View File

@ -1,2 +0,0 @@
#!/usr/bin/python
import controllers

1
addons/web_graph/controllers/__init__.py
View File

@ -1 +0,0 @@
import main

11
addons/web_graph/controllers/main.py
View File

@ -1,11 +0,0 @@
from web.controllers.main import View
import web.common as openerpweb
class GraphView(View):
_cp_path = "/web_graph/graphview"
@openerpweb.jsonrequest
def load(self, req, model, view_id):
fields_view = self.fields_view_get(req, model, view_id, 'graph')
all_fields = req.session.model(model).fields_get()
return {'fields_view': fields_view, 'all_fields':all_fields}

14
addons/web_graph/static/src/js/graph.js
View File

@ -33,8 +33,20 @@ openerp.web_graph.GraphView = openerp.web.View.extend({
this.$element.hide();
},
start: function() {
var self = this;
this._super();
return this.rpc("/web_graph/graphview/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded);
return $.when(
new openerp.web.DataSet(this, this.model).call('fields_get', []),
this.rpc('/web/view/load', {
model: this.model,
view_id: this.view_id,
view_type: 'graph'
})).then(function (fields_result, view_result) {
self.on_loaded({
all_fields: fields_result[0],
fields_view: view_result[0]
});
});
},
on_loaded: function(data) {
this.all_fields = data.all_fields;