diff options
| author | Christophe Simonis <chs@openerp.com> | 2012-10-11 11:32:52 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2012-10-11 11:32:52 +0200 |
| commit | 0e4df7d28bfcf6d6d3f853812f84b5fcd121dd29 (patch) | |
| tree | b39fb4de494e4e92b4697c8d4956d6d9e053608d /addons/web_graph/controllers | |
| parent | fe495942e7e70e032ee2d9cc0e6c16b3b55d5bdd (diff) | |
| parent | 70afbd796e441cce26171af03c26a08f88c3ab52 (diff) | |
merge upstream
bzr revid: chs@openerp.com-20121011093252-ke83ln88kw9em5y6
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) |