From 54ca46c2d66a66b2bc9f54882eeb0a462c2fb280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=C3=89vrard?= Date: Fri, 8 Apr 2022 19:07:13 +0200 Subject: [PATCH] Send only the required fields when fetching a readonly view definition issue11134 review380081002 --- company.py | 6 +----- model.py | 3 +-- party.py | 6 ++---- res.py | 3 --- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/company.py b/company.py index 34dafb4c09..4d9c602071 100644 --- a/company.py +++ b/company.py @@ -55,7 +55,7 @@ class Employee(ModelSQL, ModelView): 'company': If( Eval('company', -1) >= 0, Eval('company', None), None), }, - depends=['company'], + depends={'company'}, help="The party which represents the employee.") company = fields.Many2One('company.company', 'Company', required=True, help="The company to which the employee belongs.") @@ -65,7 +65,6 @@ class Employee(ModelSQL, ModelView): (), ) ], - depends=['end_date'], help="When the employee joins the company.") end_date = fields.Date('End Date', domain=[If((Eval('start_date')) & (Eval('end_date')), @@ -73,21 +72,18 @@ class Employee(ModelSQL, ModelView): (), ) ], - depends=['start_date'], help="When the employee leaves the company.") supervisor = fields.Many2One( 'company.employee', "Supervisor", domain=[ ('company', '=', Eval('company', -1)), ], - depends=['company'], help="The employee who oversees this employee.") subordinates = fields.One2Many( 'company.employee', 'supervisor', "Subordinates", domain=[ ('company', '=', Eval('company', -1)), ], - depends=['company'], help="The employees to be overseen by this employee.") @staticmethod diff --git a/model.py b/model.py index c38732f017..daed182416 100644 --- a/model.py +++ b/model.py @@ -52,8 +52,7 @@ def employee_field(string, states=None, company='company'): domain=[('company', '=', Eval(company, -1))], states={ 'readonly': Eval('state').in_(states), - }, - depends=[company, 'state']) + }) def set_employee(field, company='company'): diff --git a/party.py b/party.py index c0e71b33e2..2eb4ca3319 100644 --- a/party.py +++ b/party.py @@ -44,8 +44,7 @@ class PartyLang(CompanyValueMixin, metaclass=PoolMeta): def __setup__(cls): super().__setup__() cls.party.context['company'] = Eval('company', -1) - if 'company' not in cls.party.depends: - cls.party.depends.append('company') + cls.party.depends.add('company') @classmethod def __register__(cls, module_name): @@ -123,8 +122,7 @@ class ContactMechanismLanguage(CompanyValueMixin, metaclass=PoolMeta): def __setup__(cls): super().__setup__() cls.contact_mechanism.context['company'] = Eval('company', -1) - if 'company' not in cls.contact_mechanism.depends: - cls.contact_mechanism.depends.append('company') + cls.contact_mechanism.depends.add('company') class LetterReport(Report): diff --git a/res.py b/res.py index b7e28440fc..b33f69c3d3 100644 --- a/res.py +++ b/res.py @@ -39,21 +39,18 @@ class User(metaclass=PoolMeta): domain=[ ('id', 'in', Eval('companies', [])), ], - depends=['companies'], help="Select the company to work for.") employees = fields.Many2Many('res.user-company.employee', 'user', 'employee', 'Employees', domain=[ ('company', 'in', Eval('companies', [])), ], - depends=['companies'], help="Add employees to grant the user access to them.") employee = fields.Many2One('company.employee', 'Current Employee', domain=[ ('company', '=', Eval('company', -1)), ('id', 'in', Eval('employees', [])), ], - depends=['company', 'employees'], help="Select the employee to make the user behave as such.") company_filter = fields.Selection([ ('one', "Current"),