diff options
| author | Vishmita <vja@tinyerp.com> | 2012-10-11 15:58:37 +0530 |
|---|---|---|
| committer | Vishmita <vja@tinyerp.com> | 2012-10-11 15:58:37 +0530 |
| commit | ffe8dd604a833ae8c3f6b8d1fd6ccdfa02b256bb (patch) | |
| tree | 44d7961b09e4678c0ba8f3c4bc1ece4469213b6c /addons/web_graph/controllers | |
| parent | 3e15613cf7783df5175f52d0ba4945ba54890f98 (diff) | |
| parent | 70afbd796e441cce26171af03c26a08f88c3ab52 (diff) | |
[MERGE]Merge Trunk
bzr revid: vja@tinyerp.com-20121011102837-k0y1kvf901rp3l8u
Diffstat (limited to 'addons/web_graph/controllers')
| -rw-r--r-- | addons/web_graph/controllers/graph.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/addons/web_graph/controllers/graph.py b/addons/web_graph/controllers/graph.py index e5c15898155..21ec7d6e973 100644 --- a/addons/web_graph/controllers/graph.py +++ b/addons/web_graph/controllers/graph.py @@ -1,19 +1,12 @@ # -*- coding: utf-8 -*- -try: - # embedded - import openerp.addons.web.common.http as openerpweb - from openerp.addons.web.controllers.main import View -except ImportError: - # standalone - import web.common.http as openerpweb - from web.controllers.main import View +import openerp from lxml import etree -class GraphView(View): +class GraphView(openerp.addons.web.controllers.main.View): _cp_path = '/web_graph/graph' - @openerpweb.jsonrequest + @openerp.addons.web.http.jsonrequest def data_get(self, req, model=None, domain=[], context={}, group_by=[], view_id=False, orientation=False, stacked=False, mode="bar", **kwargs): obj = req.session.model(model) |