[IMP] convert controllers to the new route api
bzr revid: al@openerp.com-20131027174813-ghwl3p6w7ebr20s9
This commit is contained in:
commit
e5ad3700cb
|
@ -7,8 +7,8 @@ from werkzeug.exceptions import BadRequest
|
||||||
|
|
||||||
import openerp
|
import openerp
|
||||||
from openerp import SUPERUSER_ID
|
from openerp import SUPERUSER_ID
|
||||||
import openerp.addons.web.http as http
|
from openerp import http
|
||||||
from openerp.addons.web.http import request
|
from openerp.http import request
|
||||||
from openerp.addons.web.controllers.main import db_monodb, set_cookie_and_redirect, login_and_redirect
|
from openerp.addons.web.controllers.main import db_monodb, set_cookie_and_redirect, login_and_redirect
|
||||||
from openerp.modules.registry import RegistryManager
|
from openerp.modules.registry import RegistryManager
|
||||||
|
|
||||||
|
|
|
@ -38,8 +38,8 @@ import openerp
|
||||||
from openerp import SUPERUSER_ID
|
from openerp import SUPERUSER_ID
|
||||||
from openerp.modules.registry import RegistryManager
|
from openerp.modules.registry import RegistryManager
|
||||||
from openerp.addons.web.controllers.main import login_and_redirect, set_cookie_and_redirect
|
from openerp.addons.web.controllers.main import login_and_redirect, set_cookie_and_redirect
|
||||||
import openerp.addons.web.http as http
|
import openerp.http as http
|
||||||
from openerp.addons.web.http import request
|
from openerp.http import request
|
||||||
|
|
||||||
from .. import utils
|
from .. import utils
|
||||||
|
|
||||||
|
|
|
@ -21,10 +21,10 @@
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import openerp
|
import openerp
|
||||||
|
from openerp import http
|
||||||
|
from openerp.http import request
|
||||||
from openerp.modules.registry import RegistryManager
|
from openerp.modules.registry import RegistryManager
|
||||||
from ..res_users import SignupError
|
from ..res_users import SignupError
|
||||||
import openerp.addons.web.http as http
|
|
||||||
from openerp.addons.web.http import request
|
|
||||||
|
|
||||||
_logger = logging.getLogger(__name__)
|
_logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
import simplejson
|
import simplejson
|
||||||
|
|
||||||
from openerp.addons.web.http import Controller, route
|
from openerp.http import Controller, route
|
||||||
|
|
||||||
class ImportController(Controller):
|
class ImportController(Controller):
|
||||||
@route('/base_import/set_file')
|
@route('/base_import/set_file')
|
||||||
|
|
|
@ -4,14 +4,12 @@ from xml.etree import ElementTree
|
||||||
import openerp
|
import openerp
|
||||||
from openerp.addons.web.controllers.main import load_actions_from_ir_values
|
from openerp.addons.web.controllers.main import load_actions_from_ir_values
|
||||||
|
|
||||||
class Board(openerp.addons.web.http.Controller):
|
class Board(openerp.http.Controller):
|
||||||
_cp_path = '/board'
|
@openerp.http.route('/board/add_to_dashboard', type='json', auth='user')
|
||||||
|
def add_to_dashboard(self, menu_id, action_id, context_to_save, domain, view_mode, name=''):
|
||||||
@openerp.addons.web.http.jsonrequest
|
req = openerp.http.request
|
||||||
def add_to_dashboard(self, req, menu_id, action_id, context_to_save, domain, view_mode, name=''):
|
|
||||||
# FIXME move this method to board.board model
|
# FIXME move this method to board.board model
|
||||||
dashboard_action = load_actions_from_ir_values(
|
dashboard_action = load_actions_from_ir_values('action', 'tree_but_open', [('ir.ui.menu', menu_id)], False)
|
||||||
req, 'action', 'tree_but_open', [('ir.ui.menu', menu_id)], False)
|
|
||||||
|
|
||||||
if dashboard_action:
|
if dashboard_action:
|
||||||
action = dashboard_action[0][2]
|
action = dashboard_action[0][2]
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
import simplejson
|
import simplejson
|
||||||
import urllib
|
import urllib
|
||||||
|
|
||||||
import openerp.addons.web.http as openerpweb
|
import openerp
|
||||||
import openerp.addons.web.controllers.main as webmain
|
import openerp.addons.web.controllers.main as webmain
|
||||||
|
|
||||||
class EDI(openerpweb.Controller):
|
class EDI(openerp.http.Controller):
|
||||||
# http://hostname:8069/edi/import_url?url=URIEncodedURL
|
|
||||||
_cp_path = "/edi"
|
|
||||||
|
|
||||||
@openerpweb.httprequest
|
@openerp.http.route('/edi/import_url', type='http', auth='none')
|
||||||
def import_url(self, req, url):
|
def import_url(self, url):
|
||||||
|
# http://hostname:8069/edi/import_url?url=URIEncodedURL
|
||||||
|
req = openerp.http.request
|
||||||
modules = webmain.module_boot(req) + ['edi']
|
modules = webmain.module_boot(req) + ['edi']
|
||||||
modules_str = ','.join(modules)
|
modules_str = ','.join(modules)
|
||||||
modules_json = simplejson.dumps(modules)
|
modules_json = simplejson.dumps(modules)
|
||||||
|
@ -26,8 +26,9 @@ class EDI(openerpweb.Controller):
|
||||||
'init': 's.edi.edi_import("%s");' % safe_url,
|
'init': 's.edi.edi_import("%s");' % safe_url,
|
||||||
}
|
}
|
||||||
|
|
||||||
@openerpweb.jsonrequest
|
@openerp.http.route('/edi/import_edi_url', type='http', auth='none')
|
||||||
def import_edi_url(self, req, url):
|
def import_edi_url(self, url):
|
||||||
|
req = openerp.http.request
|
||||||
result = req.session.proxy('edi').import_edi_url(req.session._db, req.session._uid, req.session._password, url)
|
result = req.session.proxy('edi').import_edi_url(req.session._db, req.session._uid, req.session._password, url)
|
||||||
if len(result) == 1:
|
if len(result) == 1:
|
||||||
return {"action": webmain.clean_action(req, result[0][2])}
|
return {"action": webmain.clean_action(req, result[0][2])}
|
||||||
|
|
|
@ -53,7 +53,6 @@ def exp_import_edi_document(db_name, uid, passwd, edi_document, context=None):
|
||||||
def exp_import_edi_url(db_name, uid, passwd, edi_url, context=None):
|
def exp_import_edi_url(db_name, uid, passwd, edi_url, context=None):
|
||||||
return _edi_dispatch(db_name, 'import_edi', uid, None, edi_url)
|
return _edi_dispatch(db_name, 'import_edi', uid, None, edi_url)
|
||||||
|
|
||||||
@openerp.http.rpc('edi')
|
|
||||||
def dispatch(method, params):
|
def dispatch(method, params):
|
||||||
if method in ['import_edi_document', 'import_edi_url']:
|
if method in ['import_edi_document', 'import_edi_url']:
|
||||||
(db, uid, passwd) = params[0:3]
|
(db, uid, passwd) = params[0:3]
|
||||||
|
@ -63,4 +62,6 @@ def dispatch(method, params):
|
||||||
fn = globals()['exp_' + method]
|
fn = globals()['exp_' + method]
|
||||||
return fn(*params)
|
return fn(*params)
|
||||||
|
|
||||||
|
openerp.service.wsgi_server.register_rpc_endpoint('edi', dispatch)
|
||||||
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||||
|
|
|
@ -18,19 +18,19 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
import datetime
|
||||||
|
import json
|
||||||
|
import logging
|
||||||
|
import select
|
||||||
|
import time
|
||||||
|
|
||||||
import openerp
|
import openerp
|
||||||
import openerp.tools.config
|
import openerp.tools.config
|
||||||
import openerp.modules.registry
|
import openerp.modules.registry
|
||||||
import openerp.addons.web.http as http
|
from openerp import http
|
||||||
from openerp.addons.web.http import request
|
from openerp.http import request
|
||||||
from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
|
|
||||||
import datetime
|
|
||||||
from openerp.osv import osv, fields
|
from openerp.osv import osv, fields
|
||||||
import time
|
from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
|
||||||
import logging
|
|
||||||
import json
|
|
||||||
import select
|
|
||||||
|
|
||||||
_logger = logging.getLogger(__name__)
|
_logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
|
@ -19,15 +19,16 @@
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
import openerp
|
|
||||||
import openerp.addons.im.im as im
|
|
||||||
import json
|
import json
|
||||||
import random
|
import random
|
||||||
import jinja2
|
import jinja2
|
||||||
|
|
||||||
|
import openerp
|
||||||
|
import openerp.addons.im.im as im
|
||||||
from openerp.osv import osv, fields
|
from openerp.osv import osv, fields
|
||||||
from openerp import tools
|
from openerp import tools
|
||||||
import openerp.addons.web.http as http
|
from openerp import http
|
||||||
from openerp.addons.web.http import request
|
from openerp.http import request
|
||||||
|
|
||||||
env = jinja2.Environment(
|
env = jinja2.Environment(
|
||||||
loader=jinja2.PackageLoader('openerp.addons.im_livechat', "."),
|
loader=jinja2.PackageLoader('openerp.addons.im_livechat', "."),
|
||||||
|
|
|
@ -3,7 +3,7 @@ import psycopg2
|
||||||
|
|
||||||
import openerp
|
import openerp
|
||||||
from openerp import SUPERUSER_ID
|
from openerp import SUPERUSER_ID
|
||||||
import openerp.addons.web.http as http
|
from openerp import http
|
||||||
from openerp.addons.web.controllers.main import content_disposition
|
from openerp.addons.web.controllers.main import content_disposition
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
|
|
||||||
import openerp.addons.web.http as http
|
from openerp import http
|
||||||
from openerp.addons.web.http import request
|
from openerp.http import request
|
||||||
|
|
||||||
|
|
||||||
class MassMailController(http.Controller):
|
class MassMailController(http.Controller):
|
||||||
@http.route('/mail/track/<int:mail_id>/blank.gif', type='http', auth='admin')
|
@http.route('/mail/track/<int:mail_id>/blank.gif', type='http', auth='admin')
|
||||||
|
|
|
@ -6,8 +6,8 @@ import openerp
|
||||||
import time
|
import time
|
||||||
import random
|
import random
|
||||||
|
|
||||||
from openerp.addons.web import http
|
from openerp import http
|
||||||
from openerp.addons.web.http import request
|
from openerp.http import request
|
||||||
from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template
|
from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template
|
||||||
|
|
||||||
_logger = logging.getLogger(__name__)
|
_logger = logging.getLogger(__name__)
|
||||||
|
|
|
@ -26,13 +26,10 @@ from urlparse import urlparse, urlunparse
|
||||||
import openerp
|
import openerp
|
||||||
from openerp.osv import fields, osv
|
from openerp.osv import fields, osv
|
||||||
|
|
||||||
class Binary(openerp.addons.web.http.Controller):
|
class Binary(openerp.http.Controller):
|
||||||
_cp_path = "/web_linkedin/binary"
|
@openerp.http.route('/web_linkedin/binary/url2binary', type='json', auth='user')
|
||||||
|
def url2binary(self, url):
|
||||||
@openerp.addons.web.http.jsonrequest
|
|
||||||
def url2binary(self, req, url):
|
|
||||||
"""Used exclusively to load images from LinkedIn profiles, must not be used for anything else."""
|
"""Used exclusively to load images from LinkedIn profiles, must not be used for anything else."""
|
||||||
req.session.assert_valid(force=True)
|
|
||||||
_scheme, _netloc, path, params, query, fragment = urlparse(url)
|
_scheme, _netloc, path, params, query, fragment = urlparse(url)
|
||||||
# media.linkedin.com is the master domain for LinkedIn media (replicated to CDNs),
|
# media.linkedin.com is the master domain for LinkedIn media (replicated to CDNs),
|
||||||
# so forcing it should always work and prevents abusing this method to load arbitrary URLs
|
# so forcing it should always work and prevents abusing this method to load arbitrary URLs
|
||||||
|
|
Loading…
Reference in New Issue