From 5bb0933a5230aa1f42c3b8b33375b2e5bd0adc55 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 14 Jul 2016 09:55:11 +0200 Subject: [PATCH] [REVERT] 7930c3f86 Faster is nice, working is better, sale_timesheet, this commit breaks the tests and the installation of multiple modules. --- openerp/addons/base/ir/ir_ui_view.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py index ab7c25d088e..843c5ad3400 100644 --- a/openerp/addons/base/ir/ir_ui_view.py +++ b/openerp/addons/base/ir/ir_ui_view.py @@ -386,7 +386,6 @@ actual arch. :rtype: list of tuples :return: [(view_arch,view_id), ...] """ - views = self.browse() user_groups = self.env.user.groups_id conditions = [ @@ -397,16 +396,13 @@ actual arch. ] if self.pool._init and not self._context.get('load_all_views'): # Module init currently in progress, only consider views from - # modules whose code is already loaded and explicitly asked views - check_view_ids = self._context.get('check_view_ids') - if check_view_ids: - views = self.search(conditions + [('id', 'in', check_view_ids)]) - + # modules whose code is already loaded conditions.extend([ + '|', ('model_ids.module', 'in', tuple(self.pool._init_modules)), + ('id', 'in', self._context.get('check_view_ids') or (0,)), ]) - - views |= self.search(conditions) + views = self.search(conditions) return [(view.arch, view.id) for view in views.sudo()