From 870f2ff893fde64b092dfca4536f653bb69172cc Mon Sep 17 00:00:00 2001 From: Mohammed Shekha Date: Fri, 27 Feb 2015 11:38:03 +0530 Subject: [MIG] base_import_module: Migrated to new API --- addons/base_import_module/controllers/main.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'addons/base_import_module/controllers/main.py') diff --git a/addons/base_import_module/controllers/main.py b/addons/base_import_module/controllers/main.py index 4b51e69f096..1bc7ab0a15f 100644 --- a/addons/base_import_module/controllers/main.py +++ b/addons/base_import_module/controllers/main.py @@ -1,7 +1,9 @@ # -*- coding: utf-8 -*- import functools -import openerp -from openerp.http import Controller, route, request, Response + +from odoo import _ +from odoo.exceptions import AccessError +from odoo.http import Controller, route, request, Response def webservice(f): @functools.wraps(f) @@ -12,20 +14,21 @@ def webservice(f): return Response(response=str(e), status=500) return wrap + class ImportModule(Controller): def check_user(self, uid=None): if uid is None: uid = request.uid - is_admin = request.registry['res.users']._is_admin(request.cr, uid, [uid]) + is_admin = request.env['res.users'].browse(uid)._is_admin() if not is_admin: - raise openerp.exceptions.AccessError("Only administrators can upload a module") + raise AccessError(_("Only administrators can upload a module")) @route('/base_import_module/login', type='http', auth='none', methods=['POST'], csrf=False) @webservice def login(self, login, password, db=None): if db and db != request.db: - raise Exception("Could not select database '%s'" % db) + raise Exception(_("Could not select database '%s'") % db) uid = request.session.authenticate(request.db, login, password) if not uid: return Response(response="Wrong login/password", status=401) @@ -39,4 +42,4 @@ class ImportModule(Controller): def upload(self, mod_file=None, force='', **kw): self.check_user() force = True if force == '1' else False - return request.registry['ir.module.module'].import_zipfile(request.cr, request.uid, mod_file, force=force, context=request.context)[0] + return request.env['ir.module.module'].import_zipfile(mod_file, force=force)[0] -- cgit v1.2.3