From 0a3a7663d1562ca3649c87cbc2abea0c9b7334ca Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 26 Sep 2011 16:02:41 +0200
Subject: [PATCH] [IMP] remove custom implementation of fields_view_get in
 graph view

bzr revid: xmo@openerp.com-20110926140241-4xuobnvpncetk7bx
---
 addons/web_graph/__init__.py             |  2 --
 addons/web_graph/controllers/__init__.py |  1 -
 addons/web_graph/controllers/main.py     | 11 -----------
 addons/web_graph/static/src/js/graph.js  | 14 +++++++++++++-
 4 files changed, 13 insertions(+), 15 deletions(-)
 delete mode 100644 addons/web_graph/controllers/__init__.py
 delete mode 100644 addons/web_graph/controllers/main.py

diff --git a/addons/web_graph/__init__.py b/addons/web_graph/__init__.py
index 53e20f29429..e69de29bb2d 100644
--- a/addons/web_graph/__init__.py
+++ b/addons/web_graph/__init__.py
@@ -1,2 +0,0 @@
-#!/usr/bin/python
-import controllers
\ No newline at end of file
diff --git a/addons/web_graph/controllers/__init__.py b/addons/web_graph/controllers/__init__.py
deleted file mode 100644
index 039d9715fab..00000000000
--- a/addons/web_graph/controllers/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-import main
\ No newline at end of file
diff --git a/addons/web_graph/controllers/main.py b/addons/web_graph/controllers/main.py
deleted file mode 100644
index cda868c0809..00000000000
--- a/addons/web_graph/controllers/main.py
+++ /dev/null
@@ -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}
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js
index 86c37b5508a..59bc2c29dcf 100644
--- a/addons/web_graph/static/src/js/graph.js
+++ b/addons/web_graph/static/src/js/graph.js
@@ -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;