diff options
| author | TWA <twa@odoo.com> | 2018-08-06 09:23:40 +0000 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2018-10-09 11:28:00 +0000 |
| commit | 983c7e81529eb26a7a756e7d875b5638a26a3733 (patch) | |
| tree | 102dcb58f7b2e42e30ee3218ecce8849cf1dbb65 | |
| parent | a799b1329297c7a5fee84fe772e85d22cbf2c5fc (diff) | |
[IMP] mail,crm,...: Replace occurences of name_get()[0][1] by display_name
Purpose
=======
display_name is equal to doing name_get()[0][1]
Replacing name_get()[0][1] by display_name could be good for 2 things:
- Uniformization of the code
- Probable optimization if name_get is used inside a for loop on a recordset (as the values will be prefetched and put in the cache).
TaskID: 1849250
closes odoo/odoo#26341
| -rw-r--r-- | addons/crm/models/crm_lead.py | 4 | ||||
| -rw-r--r-- | addons/hr_recruitment/models/hr_recruitment.py | 2 | ||||
| -rw-r--r-- | addons/mail/data/mail_data.xml | 2 | ||||
| -rw-r--r-- | addons/mail/models/mail_activity.py | 2 | ||||
| -rw-r--r-- | addons/mail/models/mail_message.py | 2 | ||||
| -rw-r--r-- | addons/mail/models/mail_thread.py | 2 | ||||
| -rw-r--r-- | addons/mail/wizard/invite.py | 8 | ||||
| -rw-r--r-- | addons/point_of_sale/models/pos_order.py | 2 | ||||
| -rw-r--r-- | addons/product/models/product.py | 2 | ||||
| -rw-r--r-- | addons/sale_management/models/sale_order_template.py | 2 | ||||
| -rw-r--r-- | addons/test_mail/tests/test_message_track.py | 4 | ||||
| -rw-r--r-- | addons/website/models/res_partner.py | 4 | ||||
| -rw-r--r-- | addons/website_google_map/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/website_sale/views/templates.xml | 2 | ||||
| -rw-r--r-- | odoo/addons/base/models/ir_qweb_fields.py | 2 | ||||
| -rw-r--r-- | odoo/addons/test_impex/tests/test_load.py | 4 | ||||
| -rw-r--r-- | odoo/fields.py | 4 |
17 files changed, 25 insertions, 25 deletions
diff --git a/addons/crm/models/crm_lead.py b/addons/crm/models/crm_lead.py index 679cf8a3247..076ee98be60 100644 --- a/addons/crm/models/crm_lead.py +++ b/addons/crm/models/crm_lead.py @@ -563,11 +563,11 @@ class Lead(models.Model): value = next((v[1] for v in selections if v[0] == value), value) elif field.ttype == 'many2one': if value: - value = value.sudo().name_get()[0][1] + value = value.sudo().display_name elif field.ttype == 'many2many': if value: value = ','.join( - val.name_get()[0][1] + val.display_name for val in value.sudo() ) body.append("%s: %s" % (field.field_description, value or '')) diff --git a/addons/hr_recruitment/models/hr_recruitment.py b/addons/hr_recruitment/models/hr_recruitment.py index 7f146ca5d56..f1b9aae9c0c 100644 --- a/addons/hr_recruitment/models/hr_recruitment.py +++ b/addons/hr_recruitment/models/hr_recruitment.py @@ -419,7 +419,7 @@ class Applicant(models.Model): contact_name = False if applicant.partner_id: address_id = applicant.partner_id.address_get(['contact'])['contact'] - contact_name = applicant.partner_id.name_get()[0][1] + contact_name = applicant.partner_id.display_name else : new_partner_id = self.env['res.partner'].create({ 'is_company': False, diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml index a664838b5a9..655943539da 100644 --- a/addons/mail/data/mail_data.xml +++ b/addons/mail/data/mail_data.xml @@ -298,7 +298,7 @@ <template id="message_user_assigned"> <p style="margin: 0px;"> <span>Dear <t t-esc="object.user_id.name"/>,</span><br /> - <span style="margin-top: 8px;">You have been assigned to the <t t-esc="object._description.lower()"/> <t t-esc="object.name_get()[0][1]"/>.</span> + <span style="margin-top: 8px;">You have been assigned to the <t t-esc="object._description.lower()"/> <t t-esc="object.display_name"/>.</span> </p> <p style="margin-top: 24px; margin-bottom: 16px;"> <a t-att-href="'/mail/view?model=%s&res_id=%s' % (object._name, object.id)" style="background-color:#875A7B; padding: 10px; text-decoration: none; color: #fff; border-radius: 5px;"> diff --git a/addons/mail/models/mail_activity.py b/addons/mail/models/mail_activity.py index 42f30788b37..7c83ca4bf52 100644 --- a/addons/mail/models/mail_activity.py +++ b/addons/mail/models/mail_activity.py @@ -171,7 +171,7 @@ class MailActivity(models.Model): @api.depends('res_model', 'res_id') def _compute_res_name(self): for activity in self: - activity.res_name = self.env[activity.res_model].browse(activity.res_id).name_get()[0][1] + activity.res_name = self.env[activity.res_model].browse(activity.res_id).display_name @api.depends('date_deadline') def _compute_state(self): diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py index 8bedba7ca56..524b8be1dc7 100644 --- a/addons/mail/models/mail_message.py +++ b/addons/mail/models/mail_message.py @@ -882,7 +882,7 @@ class Message(models.Model): res_id = values.get('res_id', self.env.context.get('default_res_id')) if not model or not res_id or model not in self.env: return False - return self.env[model].sudo().browse(res_id).name_get()[0][1] + return self.env[model].sudo().browse(res_id).display_name @api.model def _get_reply_to(self, values): diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py index f6e31c9f32c..47174571dcb 100644 --- a/addons/mail/models/mail_thread.py +++ b/addons/mail/models/mail_thread.py @@ -376,7 +376,7 @@ class MailThread(models.AbstractModel): alias = aliases[0] if alias: - email_link = "<a href='mailto:%(email)s'>%(email)s</a>" % {'email': alias.name_get()[0][1]} + email_link = "<a href='mailto:%(email)s'>%(email)s</a>" % {'email': alias.display_name} if nothing_here: return "<p class='o_view_nocontent_smiling_face'>%(dyn_help)s</p>" % { 'dyn_help': _("Add a new %(document)s or send an email to %(email_link)s") % { diff --git a/addons/mail/wizard/invite.py b/addons/mail/wizard/invite.py index 39d6c0bdeeb..35d04f66659 100644 --- a/addons/mail/wizard/invite.py +++ b/addons/mail/wizard/invite.py @@ -12,14 +12,14 @@ class Invite(models.TransientModel): @api.model def default_get(self, fields): result = super(Invite, self).default_get(fields) - user_name = self.env.user.name_get()[0][1] + user_name = self.env.user.display_name model = result.get('res_model') res_id = result.get('res_id') if self._context.get('mail_invite_follower_channel_only'): result['send_mail'] = False if 'message' in fields and model and res_id: model_name = self.env['ir.model']._get(model).display_name - document_name = self.env[model].browse(res_id).name_get()[0][1] + document_name = self.env[model].browse(res_id).display_name message = _('<div><p>Hello,</p><p>%s invited you to follow %s document: %s.</p></div>') % (user_name, model_name, document_name) result['message'] = message elif 'message' in fields: @@ -50,9 +50,9 @@ class Invite(models.TransientModel): # send an email if option checked and if a message exists (do not send void emails) if wizard.send_mail and wizard.message and not wizard.message == '<br>': # when deleting the message, cleditor keeps a <br> message = self.env['mail.message'].create({ - 'subject': _('Invitation to follow %s: %s') % (model_name, document.name_get()[0][1]), + 'subject': _('Invitation to follow %s: %s') % (model_name, document.display_name), 'body': wizard.message, - 'record_name': document.name_get()[0][1], + 'record_name': document.display_name, 'email_from': email_from, 'reply_to': email_from, 'model': wizard.res_model, diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py index ff98c6c944d..81cc126b004 100644 --- a/addons/point_of_sale/models/pos_order.py +++ b/addons/point_of_sale/models/pos_order.py @@ -218,7 +218,7 @@ class PosOrder(models.Model): def _action_create_invoice_line(self, line=False, invoice_id=False): InvoiceLine = self.env['account.invoice.line'] - inv_name = line.product_id.name_get()[0][1] + inv_name = line.product_id.display_name inv_line = { 'invoice_id': invoice_id, 'product_id': line.product_id.id, diff --git a/addons/product/models/product.py b/addons/product/models/product.py index 5025b597cf6..b755fd5c2a4 100644 --- a/addons/product/models/product.py +++ b/addons/product/models/product.py @@ -235,7 +235,7 @@ class ProductProduct(models.Model): self.partner_ref = '%s%s' % (self.code and '[%s] ' % self.code or '', product_name) break else: - self.partner_ref = self.name_get()[0][1] + self.partner_ref = self.display_name @api.one @api.depends('image_variant', 'product_tmpl_id.image') diff --git a/addons/sale_management/models/sale_order_template.py b/addons/sale_management/models/sale_order_template.py index a81c103415b..45bcf2bb752 100644 --- a/addons/sale_management/models/sale_order_template.py +++ b/addons/sale_management/models/sale_order_template.py @@ -64,7 +64,7 @@ class SaleOrderTemplateLine(models.Model): def _onchange_product_id(self): self.ensure_one() if self.product_id: - name = self.product_id.name_get()[0][1] + name = self.product_id.display_name if self.product_id.description_sale: name += '\n' + self.product_id.description_sale self.name = name diff --git a/addons/test_mail/tests/test_message_track.py b/addons/test_mail/tests/test_message_track.py index faae6afcd57..1e8467f6664 100644 --- a/addons/test_mail/tests/test_message_track.py +++ b/addons/test_mail/tests/test_message_track.py @@ -18,8 +18,8 @@ class TestTracking(common.BaseFunctionalTest, common.MockEmails): elif value_type in ('many2one'): self.assertEqual(tracking.old_value_integer, old_value and old_value.id or False) self.assertEqual(tracking.new_value_integer, new_value and new_value.id or False) - self.assertEqual(tracking.old_value_char, old_value and old_value.name_get()[0][1] or '') - self.assertEqual(tracking.new_value_char, new_value and new_value.name_get()[0][1] or '') + self.assertEqual(tracking.old_value_char, old_value and old_value.display_name or '') + self.assertEqual(tracking.new_value_char, new_value and new_value.display_name or '') else: self.assertEqual(1, 0) diff --git a/addons/website/models/res_partner.py b/addons/website/models/res_partner.py index 247804c387b..81ae2e73b92 100644 --- a/addons/website/models/res_partner.py +++ b/addons/website/models/res_partner.py @@ -22,7 +22,7 @@ class Partner(models.Model): if not google_maps_api_key: return False params = { - 'center': '%s, %s %s, %s' % (self.street or '', self.city or '', self.zip or '', self.country_id and self.country_id.name_get()[0][1] or ''), + 'center': '%s, %s %s, %s' % (self.street or '', self.city or '', self.zip or '', self.country_id and self.country_id.display_name or ''), 'size': "%sx%s" % (width, height), 'zoom': zoom, 'sensor': 'false', @@ -33,7 +33,7 @@ class Partner(models.Model): @api.multi def google_map_link(self, zoom=10): params = { - 'q': '%s, %s %s, %s' % (self.street or '', self.city or '', self.zip or '', self.country_id and self.country_id.name_get()[0][1] or ''), + 'q': '%s, %s %s, %s' % (self.street or '', self.city or '', self.zip or '', self.country_id and self.country_id.display_name or ''), 'z': zoom, } return urlplus('https://maps.google.com/maps', params) diff --git a/addons/website_google_map/controllers/main.py b/addons/website_google_map/controllers/main.py index 092fab26a03..169eb46f7c5 100644 --- a/addons/website_google_map/controllers/main.py +++ b/addons/website_google_map/controllers/main.py @@ -43,7 +43,7 @@ class GoogleMap(http.Controller): partner_data["partners"].append({ 'id': partner.id, 'name': escape(partner.name), - 'address': escape('\n'.join(partner.name_get()[0][1].split('\n')[1:])), + 'address': escape('\n'.join(partner.display_name.split('\n')[1:])), 'latitude': escape(str(partner.partner_latitude)), 'longitude': escape(str(partner.partner_longitude)), }) diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml index 74f86a858a4..a1d0956cc16 100644 --- a/addons/website_sale/views/templates.xml +++ b/addons/website_sale/views/templates.xml @@ -630,7 +630,7 @@ <div t-foreach="product.product_variant_ids" t-as="variant_id" class="custom-control custom-radio"> <input type="radio" name="product_id" class="custom-control-input js_product_change" t-att-checked="'checked' if variant_id_index == 0 else None" t-attf-id="radio_variant_#{variant_id.id}" t-att-value="variant_id.id" t-att-data-lst_price="compute_currency(variant_id.lst_price)" t-att-data-price="variant_id.price"/> <label t-attf-for="radio_variant_#{variant_id.id}" label-default="label-default" class="custom-control-label"> - <span t-esc="variant_id.name_get()[0][1]"/> + <span t-esc="variant_id.display_name"/> <t t-set="diff_price" t-value="variant_id.price - variant_id.product_tmpl_id.price"/> <span class="badge badge-pill" t-if="diff_price != 0"> <t t-esc="diff_price > 0 and '+' or '-'"/><span t-esc="abs(diff_price)" t-options="{'widget': 'monetary', 'display_currency': website.currency_id}"/> diff --git a/odoo/addons/base/models/ir_qweb_fields.py b/odoo/addons/base/models/ir_qweb_fields.py index d0df08603e1..023a9b6ef07 100644 --- a/odoo/addons/base/models/ir_qweb_fields.py +++ b/odoo/addons/base/models/ir_qweb_fields.py @@ -643,7 +643,7 @@ class Contact(models.AbstractModel): opf = options and options.get('fields') or ["name", "address", "phone", "mobile", "email"] opsep = options and options.get('separator') or "\n" value = value.sudo().with_context(show_address=True) - name_get = value.name_get()[0][1] + name_get = value.display_name val = { 'name': name_get.split("\n")[0], diff --git a/odoo/addons/test_impex/tests/test_load.py b/odoo/addons/test_impex/tests/test_load.py index ff303eea407..34d6aa97de0 100644 --- a/odoo/addons/test_impex/tests/test_load.py +++ b/odoo/addons/test_impex/tests/test_load.py @@ -59,7 +59,7 @@ class ImporterCase(common.TransactionCase): return '%s.%s' % (d['module'], d['name']) return d['name'] - name = record.name_get()[0][1] + name = record.display_name # fix dotted name_get results, otherwise xid lookups blow up name = name.replace('.', '-') ModelData.create({ @@ -761,7 +761,7 @@ class test_m2m(ImporterCase): record2 = self.env['export.many2many.other'].create({'value': 84, 'str': 'record2'}) record3 = self.env['export.many2many.other'].create({'value': 9, 'str': 'record3'}) - name = lambda record: record.name_get()[0][1] + name = lambda record: record.display_name result = self.import_(['value'], [ ['%s,%s' % (name(record1), name(record2))], diff --git a/odoo/fields.py b/odoo/fields.py index a146a1bfa07..695b08fd120 100644 --- a/odoo/fields.py +++ b/odoo/fields.py @@ -1989,7 +1989,7 @@ class Reference(Selection): return "%s,%s" % (value._name, value.id) if value else False def convert_to_export(self, value, record): - return value.name_get()[0][1] if value else '' + return value.display_name if value else '' def convert_to_display_name(self, value, record): return ustr(value and value.display_name) @@ -2147,7 +2147,7 @@ class Many2one(_Relational): return value.id def convert_to_export(self, value, record): - return value.name_get()[0][1] if value else '' + return value.display_name if value else '' def convert_to_display_name(self, value, record): return ustr(value.display_name) |
