summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphael Collet <rco@odoo.com>2019-04-24 10:15:14 +0000
committerRaphael Collet <rco@odoo.com>2019-04-30 07:54:49 +0000
commitf44571f550dfa34ddb1a62bbe03e78a4dadf8eda (patch)
tree6c62f3f2ba05952fe75eb87c4dbdb543d66a3e42
parent63bc6013ab30acfee7fdedcd396ad3984543b99e (diff)
[IMP] base: remove `mapped()` where not necessary
-rw-r--r--odoo/addons/base/models/ir_module.py2
-rw-r--r--odoo/addons/base/models/ir_ui_view.py4
-rw-r--r--odoo/addons/base/models/res_config.py2
-rw-r--r--odoo/addons/base/models/res_users.py18
-rw-r--r--odoo/addons/base/tests/test_api.py2
-rw-r--r--odoo/addons/base/wizard/base_module_uninstall.py2
-rw-r--r--odoo/addons/base/wizard/base_partner_merge.py2
-rw-r--r--odoo/addons/test_new_api/tests/test_new_fields.py2
-rw-r--r--odoo/addons/test_new_api/tests/test_one2many.py2
-rw-r--r--odoo/fields.py2
10 files changed, 19 insertions, 19 deletions
diff --git a/odoo/addons/base/models/ir_module.py b/odoo/addons/base/models/ir_module.py
index ddccfb2c3ca..de11d836010 100644
--- a/odoo/addons/base/models/ir_module.py
+++ b/odoo/addons/base/models/ir_module.py
@@ -409,7 +409,7 @@ class Module(models.Model):
todo = result = module
while todo:
result |= todo
- todo = todo.mapped('dependencies_id.depend_id')
+ todo = todo.dependencies_id.depend_id
return result
exclusives = self.env['ir.module.category'].search([('exclusive', '=', True)])
diff --git a/odoo/addons/base/models/ir_ui_view.py b/odoo/addons/base/models/ir_ui_view.py
index e8d955137af..d317d7b0f9d 100644
--- a/odoo/addons/base/models/ir_ui_view.py
+++ b/odoo/addons/base/models/ir_ui_view.py
@@ -473,8 +473,8 @@ actual arch.
def unlink(self):
# if in uninstall mode and has children views, emulate an ondelete cascade
- if self.env.context.get('_force_unlink', False) and self.mapped('inherit_children_ids'):
- self.mapped('inherit_children_ids').unlink()
+ if self.env.context.get('_force_unlink', False) and self.inherit_children_ids:
+ self.inherit_children_ids.unlink()
super(View, self).unlink()
@api.multi
diff --git a/odoo/addons/base/models/res_config.py b/odoo/addons/base/models/res_config.py
index ac2b9a153ae..9d94f636164 100644
--- a/odoo/addons/base/models/res_config.py
+++ b/odoo/addons/base/models/res_config.py
@@ -584,7 +584,7 @@ class ResConfigSettings(models.TransientModel, ResConfigModuleInstallationMixin)
groups.write({'implied_ids': [(4, implied_group.id)]})
else:
groups.write({'implied_ids': [(3, implied_group.id)]})
- implied_group.write({'users': [(3, user.id) for user in groups.mapped('users')]})
+ implied_group.write({'users': [(3, user.id) for user in groups.users]})
self.recompute()
# config fields: store ir.config_parameters
diff --git a/odoo/addons/base/models/res_users.py b/odoo/addons/base/models/res_users.py
index 937ec8b6dd4..55c874e79a8 100644
--- a/odoo/addons/base/models/res_users.py
+++ b/odoo/addons/base/models/res_users.py
@@ -110,7 +110,7 @@ class Groups(models.Model):
@api.multi
@api.constrains('users')
def _check_one_user_type(self):
- self.mapped('users')._check_one_user_type()
+ self.users._check_one_user_type()
@api.depends('category_id.name', 'name')
def _compute_full_name(self):
@@ -367,8 +367,8 @@ class Users(models.Model):
def _compute_accesses_count(self):
for user in self:
groups = user.groups_id
- user.accesses_count = len(groups.mapped('model_access'))
- user.rules_count = len(groups.mapped('rule_groups'))
+ user.accesses_count = len(groups.model_access)
+ user.rules_count = len(groups.rule_groups)
user.groups_count = len(groups)
@api.onchange('login')
@@ -378,7 +378,7 @@ class Users(models.Model):
@api.onchange('parent_id')
def onchange_parent_id(self):
- return self.mapped('partner_id').onchange_parent_id()
+ return self.partner_id.onchange_parent_id()
def _read_from_database(self, field_names, inherited_field_names=[]):
super(Users, self)._read_from_database(field_names, inherited_field_names)
@@ -748,7 +748,7 @@ class Users(models.Model):
'res_model': 'ir.model.access',
'type': 'ir.actions.act_window',
'context': {'create': False, 'delete': False},
- 'domain': [('id', 'in', self.mapped('groups_id.model_access').ids)],
+ 'domain': [('id', 'in', self.groups_id.model_access.ids)],
'target': 'current',
}
@@ -761,7 +761,7 @@ class Users(models.Model):
'res_model': 'ir.rule',
'type': 'ir.actions.act_window',
'context': {'create': False, 'delete': False},
- 'domain': [('id', 'in', self.mapped('groups_id.rule_groups').ids)],
+ 'domain': [('id', 'in', self.groups_id.rule_groups.ids)],
'target': 'current',
}
@@ -917,7 +917,7 @@ class GroupsImplied(models.Model):
# is good, because the record cache behaves as a memo (the field is
# never computed twice on a given group.)
for g in self:
- g.trans_implied_ids = g.implied_ids | g.mapped('implied_ids.trans_implied_ids')
+ g.trans_implied_ids = g.implied_ids | g.implied_ids.trans_implied_ids
@api.model_create_multi
def create(self, vals_list):
@@ -973,7 +973,7 @@ class UsersImplied(models.Model):
elif group_portal and group_portal in user.groups_id:
gs = self.env.ref('base.group_portal') | self.env.ref('base.group_portal').trans_implied_ids
else:
- gs = user.groups_id | user.groups_id.mapped('trans_implied_ids')
+ gs = user.groups_id | user.groups_id.trans_implied_ids
values['groups_id'] = type(self).groups_id.convert_to_write(gs, user.groups_id)
return super(UsersImplied, self).create(vals_list)
@@ -1329,7 +1329,7 @@ class ChangePasswordWizard(models.TransientModel):
def change_password_button(self):
self.ensure_one()
self.user_ids.change_password_button()
- if self.env.user in self.mapped('user_ids.user_id'):
+ if self.env.user in self.user_ids.user_id:
return {'type': 'ir.actions.client', 'tag': 'reload'}
return {'type': 'ir.actions.act_window_close'}
diff --git a/odoo/addons/base/tests/test_api.py b/odoo/addons/base/tests/test_api.py
index 57a33fc3e45..b885744b06e 100644
--- a/odoo/addons/base/tests/test_api.py
+++ b/odoo/addons/base/tests/test_api.py
@@ -311,7 +311,7 @@ class TestAPI(common.TransactionCase):
partner.state_id.name
break
state_ids_with_field = [state.id
- for state in partners.mapped('state_id')
+ for state in partners.state_id
if 'name' in state._cache]
self.assertItemsEqual(state_ids_with_field, state_ids)
diff --git a/odoo/addons/base/wizard/base_module_uninstall.py b/odoo/addons/base/wizard/base_module_uninstall.py
index a3f53f38c31..5661036a8b2 100644
--- a/odoo/addons/base/wizard/base_module_uninstall.py
+++ b/odoo/addons/base/wizard/base_module_uninstall.py
@@ -56,5 +56,5 @@ class BaseModuleUninstall(models.TransientModel):
@api.multi
def action_uninstall(self):
- modules = self.mapped('module_id')
+ modules = self.module_id
return modules.button_immediate_uninstall()
diff --git a/odoo/addons/base/wizard/base_partner_merge.py b/odoo/addons/base/wizard/base_partner_merge.py
index 756aa7530d8..ceb941eca24 100644
--- a/odoo/addons/base/wizard/base_partner_merge.py
+++ b/odoo/addons/base/wizard/base_partner_merge.py
@@ -302,7 +302,7 @@ class MergePartnerAutomatic(models.TransientModel):
raise UserError(_("Only the destination contact may be linked to existing Journal Items. Please ask the Administrator if you need to merge several contacts linked to existing Journal Items."))
# Make the company of all related users consistent
- for user in partner_ids.mapped('user_ids'):
+ for user in partner_ids.user_ids:
user.sudo().write({'company_ids': [(6, 0, [dst_partner.company_id.id])],
'company_id': dst_partner.company_id.id})
diff --git a/odoo/addons/test_new_api/tests/test_new_fields.py b/odoo/addons/test_new_api/tests/test_new_fields.py
index 328a0f69ab8..b79d75a57f3 100644
--- a/odoo/addons/test_new_api/tests/test_new_fields.py
+++ b/odoo/addons/test_new_api/tests/test_new_fields.py
@@ -1229,7 +1229,7 @@ class TestX2many(common.TransactionCase):
recY = recs.create({'lines': [(0, 0, {})]})
recZ = recs.create({})
recs = recX + recY + recZ
- line1, line2, line3 = recs.mapped('lines')
+ line1, line2, line3 = recs.lines
line4 = recs.create({'lines': [(0, 0, {})]}).lines
line0 = line4.create({})
diff --git a/odoo/addons/test_new_api/tests/test_one2many.py b/odoo/addons/test_new_api/tests/test_one2many.py
index 8a1a9ef7850..f8915595c64 100644
--- a/odoo/addons/test_new_api/tests/test_one2many.py
+++ b/odoo/addons/test_new_api/tests/test_one2many.py
@@ -104,7 +104,7 @@ class One2manyCase(TransactionCase):
movies = self.Movie.search([])
movies_without_edition = movies.filtered(lambda r: not r.editions)
movies_with_edition = movies.filtered(lambda r: r.editions)
- movie_editions = movies_with_edition.mapped('editions')
+ movie_editions = movies_with_edition.editions
one_movie_edition = movie_editions[0]
res_movies_without_edition = self.Movie.search([('editions', '=', False)])
diff --git a/odoo/fields.py b/odoo/fields.py
index 6017f12f271..00a204c9404 100644
--- a/odoo/fields.py
+++ b/odoo/fields.py
@@ -2365,7 +2365,7 @@ class _RelationalMulti(_Relational):
super(_RelationalMulti, self)._compute_related(records)
if self.related_sudo:
# determine which records in the relation are actually accessible
- target = records.mapped(self.name)
+ target = records[self.name]
target_ids = set(target.search([('id', 'in', target.ids)]).ids)
accessible = lambda target: target.id in target_ids
# filter values to keep the accessible records only