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

[IMP] move http layer from openerp-web to openobject-server, convert controllers to the new route api 

bzr revid: al@openerp.com-20131027171717-dzqx2264p152lq8y
This commit is contained in:
Antony Lesuisse 2013-10-27 18:17:17 +01:00
parent a569093606
commit 401099d358
9 changed files with 19 additions and 1131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/web/__init__.py
View File

@ -1,4 +1,10 @@
import http
import sys
# Mock deprecated openerp.addons.web.http module
import openerp.http
sys.modules['openerp.addons.web.http'] = openerp.http
http = openerp.http
import controllers
import cli

5
addons/web/controllers/main.py
View File

@ -33,10 +33,9 @@ import openerp
import openerp.modules.registry
from openerp.tools.translate import _
from openerp.tools import config
from openerp import http
from .. import http
from openerp.addons.web.http import request
from openerp.http import request
#----------------------------------------------------------
# OpenERP Web helpers

7
addons/web/controllers/testing.py
View File

@ -9,11 +9,10 @@ import os
from mako.template import Template
from openerp.modules import module
from openerp import http
from openerp.http import request
from .main import module_topological_sort
from .. import http
from ..http import request
NOMODULE_TEMPLATE = Template(u"""<!DOCTYPE html>
<html>
@ -171,4 +170,4 @@ class TestRunnerController(http.Controller):
@http.route('/web/tests/get_session_value', type='json', auth="none")
def get_session_value(self):
return request.session.some_test_value
return request.session.some_test_value

4
addons/web/doc/web_controllers.rst
View File

@ -35,8 +35,8 @@ Now you can put the following content in ``controllers/my_controllers.py``:
::
import openerp.addons.web.http as http
from openerp.addons.web.http import request
import openerp.http as http
from openerp.http import request
Controller Declaration

1116
addons/web/http.py
View File

File diff suppressed because it is too large Load Diff

2
addons/web/tests/common.py
View File

@ -3,7 +3,7 @@ import unittest2
import mock
from openerp.addons.web import http
from openerp import http
class MockRequestCase(unittest2.TestCase):
def setUp(self):

2
addons/web/tests/test_dataset.py
View File

@ -2,7 +2,7 @@
from . import common
import openerp.addons.web.controllers.main
from openerp.addons.web.http import request as req
from openerp.http import request as req
class TestDataSetController(common.MockRequestCase):
def setUp(self):

2
addons/web/tests/test_menu.py
View File

@ -4,7 +4,7 @@ import collections
import mock
import unittest2
from openerp.addons.web.http import request as req
from openerp.http import request as req
from . import common

4
addons/web_diagram/controllers/main.py
View File

@ -1,8 +1,8 @@
import openerp
class DiagramView(openerp.addons.web.http.Controller):
class DiagramView(openerp.http.Controller):
@openerp.addons.web.http.route('/web_diagram/diagram/get_diagram_info', type='json', auth='user')
@openerp.http.route('/web_diagram/diagram/get_diagram_info', type='json', auth='user')
def get_diagram_info(self, req, id, model, node, connector,
src_node, des_node, label, **kw):