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

[FIX] web test suite: manually fetch registry 

bzr revid: fme@openerp.com-20140428132846-k8ofnlsse4s28jpr
This commit is contained in:
Fabien Meghazi 2014-04-28 15:28:46 +02:00
parent e82a652a7c
commit d60af567ad
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import json
import operator import operator
import os import os
import openerp
from mako.template import Template from mako.template import Template
from openerp.modules import module from openerp.modules import module
from openerp import http from openerp import http
@ -91,8 +92,6 @@ class TestRunnerController(http.Controller):
@http.route('/web/tests', type='http', auth="none") @http.route('/web/tests', type='http', auth="none")
def index(self, mod=None, **kwargs): def index(self, mod=None, **kwargs):
request.params['db'] = request.params.get('source')
ensure_db()
ms = module.get_modules() ms = module.get_modules()
manifests = dict( manifests = dict(
(name, desc) (name, desc)
@ -138,7 +137,11 @@ class TestRunnerController(http.Controller):
] ]
def bundle(xmlid): def bundle(xmlid):
return request.render(xmlid, lazy=False) dbname = request.params['source']
registry = openerp.registry(dbname)
view_obj = registry["ir.ui.view"]
uid = openerp.SUPERUSER_ID
return view_obj.render(registry.cursor(), uid, xmlid, context=request.context)
return TESTING.render(bundle=bundle, files=files, dependencies=json.dumps( return TESTING.render(bundle=bundle, files=files, dependencies=json.dumps(
[name for name in sorted_mods [name for name in sorted_mods

1
addons/web_calendar/static/src/js/web_calendar.js
View File

@ -11,7 +11,6 @@ _.str.toBoolElse = function (str, elseValues, trueValues, falseValues) {
}; };
openerp.web_calendar = function(instance) { openerp.web_calendar = function(instance) {
var _t = instance.web._t, var _t = instance.web._t,
_lt = instance.web._lt, _lt = instance.web._lt,
QWeb = instance.web.qweb; QWeb = instance.web.qweb;