From ade934121254fe6e655400cc2db1962052b9fefd Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 23 Sep 2019 06:38:23 +0000 Subject: [PATCH] [IMP] website: do not use a default name for visitors See 'Webiste Visitor (date)' as display name Remove default value as a way to easily detect if somebody has already a name or not Note using the id in the display name is a bad (may not be set yet) but is used knowlingly as a short way to differentiate 2 visitors. Linked to task id: 2073714 closes odoo/odoo#37230 Signed-off-by: Martin Trigaux (mat) --- addons/website/models/website_visitor.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/addons/website/models/website_visitor.py b/addons/website/models/website_visitor.py index d13ebe63da4..d537af42d4a 100644 --- a/addons/website/models/website_visitor.py +++ b/addons/website/models/website_visitor.py @@ -7,7 +7,7 @@ import uuid from odoo import fields, models, api, _ from odoo.addons.base.models.res_partner import _tz_get from odoo.exceptions import UserError -from odoo.tools.misc import _format_time_ago +from odoo.tools.misc import _format_time_ago, format_time from odoo.http import request from odoo.osv import expression @@ -37,7 +37,7 @@ class WebsiteVisitor(models.Model): _description = 'Website Visitor' _order = 'create_date DESC' - name = fields.Char('Name', default=_('Website Visitor')) + name = fields.Char('Name') access_token = fields.Char(required=True, default=lambda x: uuid.uuid4().hex, index=True, copy=False, groups='base.group_website_publisher') active = fields.Boolean('Active', default=True) website_id = fields.Many2one('website', "Website", readonly=True) @@ -69,11 +69,10 @@ class WebsiteVisitor(models.Model): @api.depends('name') def name_get(self): - ret_list = [] - for record in self: - name = '%s #%d' % (record.name, record.id) - ret_list.append((record.id, name)) - return ret_list + return [( + record.id, + (record.name or _('Website Visitor #%s') % record.id) + ) for record in self] @api.model def _search_last_connection(self, operator, value):