[FIX] base: fix and complete migration of base/ir

- add or fix decorators on methods
- fix most compute methods (wrong dependencies)
- revert changes in `eval_context` of `ir.actions`
- various code simplifications and improvements
- migrate methods that were not
- ir_qweb: modify `QWebContext` to take an environment instead of `cr`, `uid`, `context`
- ir_qweb: convert `AssetsBundle` to use new API `env`
- ir_ui_view: use decorator `multi` on method `read_combined`
- ir_ui_view: ensure that method `render` is never called with an xml_id
- ir_ui_view: factor out part of the `ormcache` key of method `_read_template`

1 files changed, 6 insertions, 5 deletions

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index e73cc55bc9f..b161b5411fb 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -135,9 +135,9 @@ class Website(openerp.addons.web.controllers.main.Home):
                     'locs': islice(locs, 0, LOC_PER_SITEMAP),
                     'url_root': request.httprequest.url_root[:-1],
                 }
-                urls = iuv.render(cr, uid, 'website.sitemap_locs', values, context=context)
+                urls = iuv.render_template(cr, uid, 'website.sitemap_locs', values, context=context)
                 if urls.strip():
-                    content = iuv.render(cr, uid, 'website.sitemap_xml', dict(content=urls), context=context)
+                    content = iuv.render_template(cr, uid, 'website.sitemap_xml', dict(content=urls), context=context)
                     pages += 1
                     last = create_sitemap('/sitemap-%d.xml' % pages, content)
                 else:
@@ -148,7 +148,7 @@ class Website(openerp.addons.web.controllers.main.Home):
                 ira.write(cr, uid, last, dict(url="/sitemap.xml", name="/sitemap.xml"), context=context)
             else:
                 # Sitemaps must be split in several smaller files with a sitemap index
-                content = iuv.render(cr, uid, 'website.sitemap_index_xml', dict(
+                content = iuv.render_template(cr, uid, 'website.sitemap_index_xml', dict(
                     pages=range(1, pages + 1),
                     url_root=request.httprequest.url_root,
                 ), context=context)
@@ -317,7 +317,7 @@ class Website(openerp.addons.web.controllers.main.Home):
         set_active(enable, True)
 
         if get_bundle:
-            bundle = AssetsBundle('web.assets_frontend', cr=http.request.cr, uid=http.request.uid, context={}, registry=http.request.registry)
+            bundle = AssetsBundle('web.assets_frontend', env=request.env(context={}))
             return bundle.to_html()
 
         return True
@@ -329,9 +329,10 @@ class Website(openerp.addons.web.controllers.main.Home):
 
     @http.route(['/website/multi_render'], type='json', auth="public", website=True)
     def multi_render(self, ids_or_xml_ids, values=None):
+        View = request.env['ir.ui.view']
         res = {}
         for id_or_xml_id in ids_or_xml_ids:
-            res[id_or_xml_id] = request.registry["ir.ui.view"].render(request.cr, request.uid, id_or_xml_id, values=values, engine='ir.qweb', context=request.context)
+            res[id_or_xml_id] = View.render_template(id_or_xml_id, values)
         return res
 
     #------------------------------------------------------