diff --git a/addons/event/data/event_demo.xml b/addons/event/data/event_demo.xml index 3b6385ce406..6cf245d577b 100644 --- a/addons/event/data/event_demo.xml +++ b/addons/event/data/event_demo.xml @@ -30,7 +30,6 @@ US/Pacific - DesignFairLA diff --git a/addons/event/models/event_event.py b/addons/event/models/event_event.py index dc6ea19677d..34ede63a323 100644 --- a/addons/event/models/event_event.py +++ b/addons/event/models/event_event.py @@ -66,8 +66,6 @@ class EventType(models.Model): default_timezone = fields.Selection( _tz_get, string='Timezone', default=lambda self: self.env.user.tz or 'UTC') # communication - use_hashtag = fields.Boolean('Use Default Hashtag') - default_hashtag = fields.Char('Twitter Hashtag') use_mail_schedule = fields.Boolean( 'Automatically Send Emails', default=True) event_type_mail_ids = fields.One2many( @@ -180,7 +178,6 @@ class EventEvent(models.Model): default=lambda self: self.env.company.partner_id, domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]") country_id = fields.Many2one('res.country', 'Country', related='address_id.country_id', store=True, readonly=False) - twitter_hashtag = fields.Char('Twitter Hashtag') # badge fields badge_front = fields.Html(string='Badge Front') badge_back = fields.Html(string='Badge Back') @@ -303,9 +300,6 @@ class EventEvent(models.Model): if self.event_type_id.auto_confirm: self.auto_confirm = self.event_type_id.auto_confirm - if self.event_type_id.use_hashtag: - self.twitter_hashtag = self.event_type_id.default_hashtag - if self.event_type_id.use_timezone: self.date_tz = self.event_type_id.default_timezone diff --git a/addons/event/tests/common.py b/addons/event/tests/common.py index 9dc01aa8011..e85f7f16884 100644 --- a/addons/event/tests/common.py +++ b/addons/event/tests/common.py @@ -57,8 +57,6 @@ class TestEventCommon(common.SavepointCase): 'default_registration_max': 30, 'use_timezone': True, 'default_timezone': 'Europe/Paris', - 'use_hashtag': True, - 'default_hashtag': 'amazing', 'use_ticket': True, 'event_type_ticket_ids': [(0, 0, { 'name': 'First Ticket', diff --git a/addons/event/tests/test_event_internals.py b/addons/event/tests/test_event_internals.py index ad07e4b0b1c..c8b8c05f074 100644 --- a/addons/event/tests/test_event_internals.py +++ b/addons/event/tests/test_event_internals.py @@ -120,13 +120,11 @@ class TestEventData(TestEventCommon): 'date_begin': FieldsDatetime.to_string(datetime.today() + timedelta(days=1)), 'date_end': FieldsDatetime.to_string(datetime.today() + timedelta(days=15)), 'auto_confirm': False, - 'twitter_hashtag': 'somuchwow', 'is_online': True, }) self.assertEqual(event.date_tz, self.env.user.tz) self.assertEqual(event.seats_availability, 'unlimited') self.assertFalse(event.auto_confirm) - self.assertEqual(event.twitter_hashtag, 'somuchwow') self.assertTrue(event.is_online) self.assertEqual(event.event_mail_ids, self.env['event.mail']) @@ -137,7 +135,6 @@ class TestEventData(TestEventCommon): self.assertEqual(event.seats_min, event_type.default_registration_min) self.assertEqual(event.seats_max, event_type.default_registration_max) self.assertTrue(event.auto_confirm) - self.assertEqual(event.twitter_hashtag, event_type.default_hashtag) self.assertFalse(event.is_online) self.assertEqual(event.event_mail_ids, self.env['event.mail']) diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml index c355af5473f..4e3c43739ff 100644 --- a/addons/event/views/event_views.xml +++ b/addons/event/views/event_views.xml @@ -68,21 +68,6 @@ -
-
- -
-
-
-

Visibility

@@ -245,11 +230,6 @@ - diff --git a/addons/website_event/data/event_demo.xml b/addons/website_event/data/event_demo.xml index 89de26a6577..14a3671f776 100644 --- a/addons/website_event/data/event_demo.xml +++ b/addons/website_event/data/event_demo.xml @@ -2,7 +2,6 @@ True - DesignFair Get Inspired • Stay Connected • Have Fun {"background-image": "url('/website_event/static/src/img/event_cover_0.jpg')", "resize_class": "o_record_has_cover o_half_screen_height", "opacity": "0.4"} True True The Great Reno Balloon Race is the world's largest free hot-air ballooning event. - RenoRace {"background-image": "url('/website_event/static/src/img/event_cover_1.jpg')", "resize_class": "o_record_has_cover o_half_screen_height", "opacity": "0.4"} True Enhance your architectural business and improve professional skills. - odoo {"background-image": "url('/website_event/static/src/img/event_cover_2.jpg')", "resize_class": "o_record_has_cover o_half_screen_height", "opacity": "0.4"} @@ -93,27 +90,23 @@ True Experience live music, local food and beverages. - odoo {"background-image": "url('/website_event/static/src/img/event_cover_3.jpg')", "resize_class": "o_record_has_cover o_half_screen_height", "opacity": "0.4"} True Discover how to grow a sustainable business with our experts. - odoo {"background-image": "url('/website_event/static/src/img/event_cover_4.jpg')", "resize_class": "o_record_has_cover o_half_screen_height", "opacity": "0.4"} True Bring your outdoor field hockey season to the next level by taking the field at this 9th annual Field Hockey tournament. - odoo {"background-image": "url('/website_event/static/src/img/event_cover_5.jpg')", "resize_class": "o_record_has_cover o_half_screen_height", "opacity": "0.4"} False - odoo {"background-image": "none", "background-color": "secondary", "opacity": ""} @@ -135,7 +128,6 @@ True - odoo diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml index 4a51e20b55a..2855de26591 100644 --- a/addons/website_event/views/event_templates.xml +++ b/addons/website_event/views/event_templates.xml @@ -484,7 +484,6 @@
SHARE

Find out what people see and say about this event, and join the conversation.

-

Hashtag: #

diff --git a/addons/website_event_track/views/event_track_templates.xml b/addons/website_event_track/views/event_track_templates.xml index eabbd1dfe9c..1d9c6cfefa2 100644 --- a/addons/website_event_track/views/event_track_templates.xml +++ b/addons/website_event_track/views/event_track_templates.xml @@ -264,27 +264,6 @@ - -