[MERGE] Forward-port latest bugfixes from 8.0 up to cbb51610ee1506e67f5aaab703130ff8a2d824b6

1 files changed, 5 insertions, 39 deletions

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 3e2bcbeb8dc..401dd4c50df 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -221,49 +221,15 @@ class Website(openerp.addons.web.controllers.main.Home):
         ``full=True`` returns inherit view's informations of the template ``key``.
         ``bundles=True`` returns also the asset bundles
         """
-        imd = request.registry['ir.model.data']
-        view_model, view_theme_id = imd.get_object_reference(
-            request.cr, request.uid, 'website', 'theme')
-
-        user = request.registry['res.users']\
-            .browse(request.cr, request.uid, request.uid, request.context)
-        user_groups = set(user.groups_id)
-        views = request.registry["ir.ui.view"]\
-            ._views_get(request.cr, request.uid, key, bundles=bundles, context=dict(request.context or {}, active_test=False))
-        done = set()
-        result = []
-        for v in views:
-            if not user_groups.issuperset(v.groups_id):
-                continue
-            if full or (v.customize_show and v.inherit_id.id != view_theme_id):
-                if v.inherit_id not in done:
-                    result.append({
-                        'name': v.inherit_id.name,
-                        'id': v.id,
-                        'key': v.key,
-                        'inherit_id': v.inherit_id.id,
-                        'header': True,
-                        'active': False
-                    })
-                    done.add(v.inherit_id)
-                result.append({
-                    'name': v.name,
-                    'id': v.id,
-                    'key': v.key,
-                    'inherit_id': v.inherit_id.id,
-                    'header': False,
-                    'active': v.active,
-                })
-        return result
+        return request.registry["ir.ui.view"].customize_template_get(
+            request.cr, request.uid, key, full=full, bundles=bundles,
+            context=request.context)
 
     @http.route('/website/get_view_translations', type='json', auth='public', website=True)
     def get_view_translations(self, xml_id, lang=None):
         lang = lang or request.context.get('lang')
-        views = self.customize_template_get(xml_id, full=True)
-        views_ids = [view.get('id') for view in views if view.get('active')]
-        domain = [('type', '=', 'view'), ('res_id', 'in', views_ids), ('lang', '=', lang)]
-        irt = request.registry.get('ir.translation')
-        return irt.search_read(request.cr, request.uid, domain, ['id', 'res_id', 'value','state','gengo_translation'], context=request.context)
+        return request.registry["ir.ui.view"].get_view_translations(
+            request.cr, request.uid, xml_id, lang=lang, context=request.context)
 
     @http.route('/website/set_translations', type='json', auth='public', website=True)
     def set_translations(self, data, lang):