diff options
| author | qmo-odoo <qmo@odoo.com> | 2020-02-06 13:35:43 +0000 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2020-02-11 14:36:52 +0000 |
| commit | b0ec3aa1ebb92d4d0100fb3f2a0b97f2a0d364ea (patch) | |
| tree | 55e4fe5c696410e26b4c0daf261ea8fdb236330e | |
| parent | 90075be37305daa339dc3378c5daf2181f00f60c (diff) | |
[REF] event: remove twitter_hashtag and its configuration on event type
This commit removes the field twitter_hashtag from event and event_type.
The justification behind this change is that it has been made obsolete
by our social marketing app and our website builder.
Task ID 2191921
Community PR odoo/odoo#44715
Upgrade PR odoo/upgrade#764
Related: odoo/upgrade#764
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
| -rw-r--r-- | addons/event/data/event_demo.xml | 1 | ||||
| -rw-r--r-- | addons/event/models/event_event.py | 6 | ||||
| -rw-r--r-- | addons/event/tests/common.py | 2 | ||||
| -rw-r--r-- | addons/event/tests/test_event_internals.py | 3 | ||||
| -rw-r--r-- | addons/event/views/event_views.xml | 20 | ||||
| -rw-r--r-- | addons/website_event/data/event_demo.xml | 8 | ||||
| -rw-r--r-- | addons/website_event/views/event_templates.xml | 1 | ||||
| -rw-r--r-- | addons/website_event_track/views/event_track_templates.xml | 21 |
8 files changed, 0 insertions, 62 deletions
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 @@ <field name="date_tz">US/Pacific</field> <field name="event_type_id" ref="event_type_0"/> <field name="auto_confirm" eval="False"/> - <field name="twitter_hashtag">DesignFairLA</field> <field name="stage_id" ref="event_stage_booked"/> </record> <record id="event_0_ticket_0" model="event.event.ticket"> 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 @@ </div> </div> </div> - <div class="col-12 col-lg-6 o_setting_box"> - <div class="o_setting_left_pane"> - <field name="use_hashtag"/> - </div> - <div class="o_setting_right_pane"> - <label for="use_hashtag"/> - <div class="row"> - <div class="col-lg-8 mt16" attrs="{'invisible': [('use_hashtag', '=', False)]}"> - <label for="default_hashtag"/> - <field name="default_hashtag" - attrs="{'required': [('use_hashtag', '=', True)]}"/> - </div> - </div> - </div> - </div> </div> <h2>Visibility</h2> <div class="row mt16 o_settings_container" name="event_type_visibility"> @@ -245,11 +230,6 @@ </group> <group> <field name="event_type_id" options="{'no_create':True}"/> - <label for="twitter_hashtag"/> - <div> - <span class="oe_inline"># </span> - <field name="twitter_hashtag" nolabel="1" class="oe_inline"/> - </div> <field name="auto_confirm" groups="base.group_no_one"/> </group> <group> 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 @@ <odoo> <record id="event.event_0" model="event.event"> <field name="is_published">True</field> - <field name="twitter_hashtag">DesignFair</field> <field name="subtitle">Get Inspired • Stay Connected • Have Fun</field> <field name="cover_properties">{"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"}</field> <field name="description"><![CDATA[ @@ -43,14 +42,12 @@ <field name="website_menu">True</field> <field name="website_published">True</field> <field name="subtitle">The Great Reno Balloon Race is the world's largest free hot-air ballooning event.</field> - <field name="twitter_hashtag">RenoRace</field> <field name="cover_properties">{"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"}</field> </record> <record id="event.event_2" model="event.event"> <field name="website_published">True</field> <field name="subtitle">Enhance your architectural business and improve professional skills.</field> - <field name="twitter_hashtag">odoo</field> <field name="cover_properties">{"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"}</field> <field name="description"><![CDATA[ <div class="oe_structure"> @@ -93,27 +90,23 @@ <record id="event.event_3" model="event.event"> <field name="website_published">True</field> <field name="subtitle">Experience live music, local food and beverages.</field> - <field name="twitter_hashtag">odoo</field> <field name="cover_properties">{"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"}</field> </record> <record id="event.event_4" model="event.event"> <field name="website_published">True</field> <field name="subtitle">Discover how to grow a sustainable business with our experts.</field> - <field name="twitter_hashtag">odoo</field> <field name="cover_properties">{"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"}</field> </record> <record id="event.event_5" model="event.event"> <field name="website_published">True</field> <field name="subtitle">Bring your outdoor field hockey season to the next level by taking the field at this 9th annual Field Hockey tournament.</field> - <field name="twitter_hashtag">odoo</field> <field name="cover_properties">{"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"}</field> </record> <record id="event.event_6" model="event.event"> <field name="website_published">False</field> - <field name="twitter_hashtag">odoo</field> <field name="cover_properties">{"background-image": "none", "background-color": "secondary", "opacity": ""}</field> </record> @@ -135,7 +128,6 @@ <record id="event.event_2" model="event.event"> <field name="is_published">True</field> - <field name="twitter_hashtag">odoo</field> </record> <record id="base.res_partner_address_4" model="res.partner"> 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 @@ <div class="o_wevent_sidebar_block"> <h6 class="o_wevent_sidebar_title">SHARE</h6> <p class="mb-2">Find out what people see and say about this event, and join the conversation.</p> - <p t-if="event.twitter_hashtag" class="font-weight-bold">Hashtag: <a t-att-href="'http://twitter.com/search?q=%23'+event.twitter_hashtag" target="_blank">#<span t-field="event.twitter_hashtag"/></a></p> <t t-call="website.s_share"> <t t-set="_no_title" t-value="True"/> <t t-set="_classes" t-valuef="o_wevent_sidebar_social mx-n1"/> 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 @@ </t> </template> -<template id="event_track_social" name="Social Widgets" inherit_id="website_event_track.track_view" active="False" customize_show="True"> - <xpath expr="//div[@id='right_column']" position="inside"> - <div class="card"> - <h4 class="card-header">Social Stream</h4> - <div class="card-body"> - <t t-call="website_mail.follow"><t t-set="object" t-value="event"/></t> - <div t-if="event.twitter_hashtag" class="mt16"> - <p><strong>Participate on Twitter</strong></p> - <p class="text-muted"> - Find out what people see and say about this event, - and join the conversation. - </p> - <p><strong>Use this tag: - <a t-att-href="'http://twitter.com/search?q=#'+event.twitter_hashtag" class="badge badge-primary">#<span t-field="event.twitter_hashtag"/></a> - </strong></p> - </div> - </div> - </div> - </xpath> -</template> - <template id="event_track_proposal"> <t t-call="website_event.layout"> <div class="oe_structure" id="oe_structure_website_event_track_proposal_1"/> |
