From 14ce43f2eec7f26fd59c9647f0d4a2b838eb3a4b Mon Sep 17 00:00:00 2001 From: Patrick Hoste Date: Mon, 3 Feb 2020 14:18:05 +0000 Subject: [PATCH] [IMP] event: change name field from event registration + minor changes PURPOSE Make 'name' field from event registration mandatory. Change placeholder for event name to give an example. LINKS Task ID : 2093336 PR : #43420 --- addons/event/models/event_registration.py | 2 +- addons/event/tests/test_event_internals.py | 11 +++++++---- addons/event/tests/test_event_security.py | 4 ++-- addons/event/views/event_views.xml | 4 ++-- addons/website_event/tests/test_event_website.py | 1 + .../tests/test_event_track_website.py | 1 + 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/addons/event/models/event_registration.py b/addons/event/models/event_registration.py index 681516c4dce..5f6c32a620b 100644 --- a/addons/event/models/event_registration.py +++ b/addons/event/models/event_registration.py @@ -29,7 +29,7 @@ class EventRegistration(models.Model): partner_id = fields.Many2one( 'res.partner', string='Contact', states={'done': [('readonly', True)]}) - name = fields.Char(string='Attendee Name', index=True) + name = fields.Char(string='Attendee Name', index=True, required=True, tracking=True) email = fields.Char(string='Email') phone = fields.Char(string='Phone') mobile = fields.Char(string='Mobile') diff --git a/addons/event/tests/test_event_internals.py b/addons/event/tests/test_event_internals.py index f19090f791c..ad07e4b0b1c 100644 --- a/addons/event/tests/test_event_internals.py +++ b/addons/event/tests/test_event_internals.py @@ -21,7 +21,7 @@ class TestEventData(TestEventCommon): event = self.event_0.with_user(self.env.user) event.write({ - 'registration_ids': [(0, 0, {'partner_id': self.customer.id})], + 'registration_ids': [(0, 0, {'partner_id': self.customer.id, 'name': 'test_reg'})], 'date_begin': datetime(2020, 1, 31, 15, 0, 0), 'date_end': datetime(2020, 4, 5, 18, 0, 0), }) @@ -79,15 +79,18 @@ class TestEventData(TestEventCommon): self.assertTrue(event.auto_confirm) for x in range(5): reg = self.env['event.registration'].create({ - 'event_id': event.id + 'event_id': event.id, + 'name': 'reg_open', }) self.assertEqual(reg.state, 'open') reg_draft = self.env['event.registration'].create({ - 'event_id': event.id + 'event_id': event.id, + 'name': 'reg_draft', }) reg_draft.write({'state': 'draft'}) reg_done = self.env['event.registration'].create({ - 'event_id': event.id + 'event_id': event.id, + 'name': 'reg_done', }) reg_done.write({'state': 'done'}) self.assertEqual(event.seats_available, event.event_type_id.default_registration_max - 6) diff --git a/addons/event/tests/test_event_security.py b/addons/event/tests/test_event_security.py index ef056c438b5..d2ac6d275a3 100644 --- a/addons/event/tests/test_event_security.py +++ b/addons/event/tests/test_event_security.py @@ -83,8 +83,8 @@ class TestEventSecurity(TestEventCommon): event._onchange_type() event.flush() - registration = self.env['event.registration'].create({'event_id': event.id}) - registration.write({'name': 'Myself'}) + registration = self.env['event.registration'].create({'event_id': event.id, 'name': 'Myself'}) + registration.write({'name': 'Myself2'}) stage = self.env.ref('event.event_stage_done') stage.write({'name': 'ManagerEnded'}) diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml index d2e46c41b56..c355af5473f 100644 --- a/addons/event/views/event_views.xml +++ b/addons/event/views/event_views.xml @@ -227,8 +227,8 @@
-
diff --git a/addons/website_event/tests/test_event_website.py b/addons/website_event/tests/test_event_website.py index b01c975bb71..cc8098bd75f 100644 --- a/addons/website_event/tests/test_event_website.py +++ b/addons/website_event/tests/test_event_website.py @@ -27,6 +27,7 @@ class TestEventWebsite(TestEventWebsiteHelper): 'date_end': fields.Datetime.to_string(datetime.today() + timedelta(days=15)), 'registration_ids': [(0, 0, { 'partner_id': self.user_eventuser.partner_id.id, + 'name': 'test_reg', })], 'website_menu': True, }) diff --git a/addons/website_event_track/tests/test_event_track_website.py b/addons/website_event_track/tests/test_event_track_website.py index b84ba41547c..17f424bc538 100644 --- a/addons/website_event_track/tests/test_event_track_website.py +++ b/addons/website_event_track/tests/test_event_track_website.py @@ -16,6 +16,7 @@ class TestEventWebsiteTrack(TestEventWebsiteHelper): 'date_end': fields.Datetime.to_string(datetime.today() + timedelta(days=15)), 'registration_ids': [(0, 0, { 'partner_id': self.user_eventuser.partner_id.id, + 'name': 'test_reg', })], 'website_menu': True, 'website_track': True,