diff --git a/addons/test_event_full/static/src/js/tours/wevent_register_tour.js b/addons/test_event_full/static/src/js/tours/wevent_register_tour.js index 1b12c66d920..2d44644cdb3 100644 --- a/addons/test_event_full/static/src/js/tours/wevent_register_tour.js +++ b/addons/test_event_full/static/src/js/tours/wevent_register_tour.js @@ -24,27 +24,27 @@ var discoverTalkSteps = function (talkName, fromList, reminderOn, toggleReminder } if (reminderOn) { steps = steps.concat([{ - content: "Check Reminder is on", + content: "Check Favorite is on", trigger: 'div.o_wetrack_js_reminder i.fa-bell', - extra_trigger: 'span.o_wetrack_js_reminder_text:contains("Reminder On")', + extra_trigger: 'span.o_wetrack_js_reminder_text:contains("Favorite On")', run: function () {}, // it's a check }]); } else { steps = steps.concat([{ - content: "Check Reminder is Off", - trigger: 'span.o_wetrack_js_reminder_text:contains("Set Reminder")', + content: "Check Favorite is Off", + trigger: 'span.o_wetrack_js_reminder_text:contains("Set Favorite")', run: function () {}, // it's a check }]); if (toggleReminder) { steps = steps.concat([{ - content: "Set Reminder", + content: "Set Favorite", trigger: 'span.o_wetrack_js_reminder_text', run: 'click', }, { - content: "Check Reminder is On", + content: "Check Favorite is On", trigger: 'div.o_wetrack_js_reminder i.fa-bell', - extra_trigger: 'span.o_wetrack_js_reminder_text:contains("Reminder On")', + extra_trigger: 'span.o_wetrack_js_reminder_text:contains("Favorite On")', run: function () {}, // it's a check }]); } diff --git a/addons/website_event/data/res_partner_demo.xml b/addons/website_event/data/res_partner_demo.xml index f82a64833fe..a6fec3a3f12 100644 --- a/addons/website_event/data/res_partner_demo.xml +++ b/addons/website_event/data/res_partner_demo.xml @@ -210,7 +210,7 @@ - + http://azure.example.com diff --git a/addons/website_event/models/event_event.py b/addons/website_event/models/event_event.py index 72f8096b5a1..53a433df6a4 100644 --- a/addons/website_event/models/event_event.py +++ b/addons/website_event/models/event_event.py @@ -114,14 +114,10 @@ class Event(models.Model): @api.depends("event_type_id", "website_menu", "community_menu") def _compute_community_menu(self): - """ At type onchange: synchronize. At website_menu update: synchronize. """ + """ Set False in base module. Sub modules will add their own logic + (meet or track_quiz). """ for event in self: - if event.event_type_id and event.event_type_id != event._origin.event_type_id: - event.community_menu = event.event_type_id.community_menu - elif event.website_menu and event.website_menu != event._origin.website_menu or not event.community_menu: - event.community_menu = True - elif not event.website_menu: - event.community_menu = False + event.community_menu = False @api.depends("event_type_id", "website_menu") def _compute_menu_register_cta(self): @@ -129,7 +125,7 @@ class Event(models.Model): for event in self: if event.event_type_id and event.event_type_id != event._origin.event_type_id: event.menu_register_cta = event.event_type_id.menu_register_cta - elif event.website_menu and event.website_menu != event._origin.website_menu or not event.menu_register_cta: + elif event.website_menu and (event.website_menu != event._origin.website_menu or not event.menu_register_cta): event.menu_register_cta = True elif not event.website_menu: event.menu_register_cta = False diff --git a/addons/website_event/views/event_event_views.xml b/addons/website_event/views/event_event_views.xml index f364ac129c6..7a00591f195 100644 --- a/addons/website_event/views/event_event_views.xml +++ b/addons/website_event/views/event_event_views.xml @@ -25,8 +25,8 @@ diff --git a/addons/website_event_track/data/event_track_demo.xml b/addons/website_event_track/data/event_track_demo.xml index 71308eb0736..aec7c85d33e 100644 --- a/addons/website_event_track/data/event_track_demo.xml +++ b/addons/website_event_track/data/event_track_demo.xml @@ -354,7 +354,8 @@ 1 - + + - A House Made of Woods ? + Easy Way To Build a Wooden House 2 @@ -385,10 +386,10 @@ - + - 2 + 1 @@ -396,8 +397,21 @@ http://www.example.com 10 - + Top 10 Most Expensive Wood in the World + 3 + + + + + + + 1 + + + + + Securing your Lumber during transport 3 @@ -410,8 +424,8 @@ - - Meet our woods producers + + Woodworking: How I got started! 3 @@ -423,7 +437,7 @@ - + Dealing with OpenWood Furniture 6 @@ -436,7 +450,7 @@ - + Kitchens for the Future 7 @@ -456,10 +470,10 @@ - + - 3 + 2 @@ -500,14 +514,14 @@ 1 - + - 2 + 1 @@ -553,6 +567,19 @@ + Logs to lumber + 3 + + + + + + + 1 + + + + Pretty. Ugly. Lovely. 4 @@ -565,11 +592,12 @@ - + 10 DIY Furniture Ideas For Absolute Beginners 7 + @@ -578,20 +606,32 @@ - + 6 Woodworking tips and tricks for beginners 7 - - + - 1.5 + 1 + + DIY Timber Cladding Project + 7 + + + + + + + 1 + + + Live Testimonial @@ -649,13 +689,13 @@ (4, ref('website_event_track.event_track_tag3')), (4, ref('website_event_track.event_track_tag13'))]"/> - 2 + 1.5 - Tools for Wood + Tools for the Woodworking Beginner 3 @@ -668,8 +708,8 @@ - Repairing Tools - 3 + Restoring Old Woodworking Tools + 7 diff --git a/addons/website_event_track/data/event_track_demo_description.xml b/addons/website_event_track/data/event_track_demo_description.xml index 86e5528bed8..030e6293a07 100644 --- a/addons/website_event_track/data/event_track_demo_description.xml +++ b/addons/website_event_track/data/event_track_demo_description.xml @@ -1,15 +1,74 @@ - + -

A summary of know-how: how and what. All the basics for this course about gardening.

+

Considering to build a wooden house? Watch this video to find out more information about a construction process and final result. Step by step simple explanation! Interested?

 -

A summary of know-how: how and what. All the basics for this course about gardening.

+

Top most expensive wood in the world is quite interesting topic and several people may be surprised + that there are hundreds of wood types exist around the globe following different properties and use.

+

There are several variants of wood is available in the world but we are talking about most expensive + ones in the world and keeping to the point we have arranged ten most expensive wood.

+ + + + +

Use these simple steps to easily haul LONG lumber in a short box pickup truck. A dose of carpenter's + ingenuity along with a couple boards, a sturdy strap and a few screws are all I use to easily haul + long boards from the lumberyard to the Next Level Carpentry shop or jobsite.

+

Using a unique wrapping method for a tie down strap (NOT Bungee cords!!!) allows lumber to be + cinched securely WITHOUT the need to tie and untie tricky or complicated knots.

+ + + + +

Probably one of the most asked questions I've gotten is how I got started woodworking! In this video I share with you how/why I started building furniture!

+ + + + +

Considering to build a wooden house? Watch this video to find out more information about a construction process and final result. Step by step simple explanation! Interested?

+ + + + +

In this video we will see how lumber is made in a sawmill factory.

+ + + + +

As you may have heard before, making your own furniture is actually not as difficult or as complicated as you think. + In fact, some projects are so easy anyone could successfully complete them. For example, making a cute stool out of + a old tire is a real piece of cake and if you’re in need of a coffee table you can easily put one together using + wood crates.

+

There are a lot of ideas worth exploring so start with the 10 DIY furniture ideas for absolute beginners.

+ + + + +

In this video, I covered 6 tips and tricks to help out beginners: +

    +
  • Making a center marking gauge
    • +
  • Bandy clamp hack
    • +
  • Right angle clamp jig
    • +
  • Miter saw tip
    • +
  • Glue tip
    • +
  • Dowel Hack
    • +
+

+ + + + +

Link to Q&A here! The time has come to hide those old block walls. Love simple and transformation type projects like this! :)-

+ + + + +

Restoring old woodworking tools

 - diff --git a/addons/website_event_track/models/event_event.py b/addons/website_event_track/models/event_event.py index 7d7dc086077..1b62b47a27e 100644 --- a/addons/website_event_track/models/event_event.py +++ b/addons/website_event_track/models/event_event.py @@ -37,17 +37,17 @@ class Event(models.Model): for event in self: event.sponsor_count = result.get(event.id, 0) - @api.depends('event_type_id', 'website_menu', 'website_track_proposal') + @api.depends('event_type_id', 'website_menu') def _compute_website_track(self): """ Propagate event_type configuration (only at change); otherwise propagate website_menu updated value. Also force True is track_proposal changes. """ for event in self: if event.event_type_id and event.event_type_id != event._origin.event_type_id: event.website_track = event.event_type_id.website_track - elif event.website_menu != event._origin.website_menu or not event.website_menu or not event.website_track: - event.website_track = event.website_menu - elif event.website_track_proposal and not event.website_track: + elif event.website_menu and (event.website_menu != event._origin.website_menu or not event.website_track): event.website_track = True + elif not event.website_menu: + event.website_track = False @api.depends('event_type_id', 'website_track') def _compute_website_track_proposal(self): @@ -80,9 +80,9 @@ class Event(models.Model): def _update_website_menus(self, menus_update_by_field=None): super(Event, self)._update_website_menus(menus_update_by_field=menus_update_by_field) for event in self: - if (not menus_update_by_field) or (event in menus_update_by_field.get('website_track')): + if event.menu_id and (not menus_update_by_field or event in menus_update_by_field.get('website_track')): event._update_website_menu_entry('website_track', 'track_menu_ids', '_get_track_menu_entries') - if (not menus_update_by_field) or (event in menus_update_by_field.get('website_track_proposal')): + if event.menu_id and (not menus_update_by_field or event in menus_update_by_field.get('website_track_proposal')): event._update_website_menu_entry('website_track_proposal', 'track_proposal_menu_ids', '_get_track_proposal_menu_entries') def _get_menu_type_field_matching(self): @@ -104,7 +104,7 @@ class Event(models.Model): self.ensure_one() return [ (_('Talks'), '/event/%s/track' % slug(self), False, 10, 'track'), - (_('Agenda'), '/event/%s/agenda' % slug(self), False, 70, False) + (_('Agenda'), '/event/%s/agenda' % slug(self), False, 70, 'track') ] def _get_track_proposal_menu_entries(self): diff --git a/addons/website_event_track/static/src/js/event_track_reminder.js b/addons/website_event_track/static/src/js/event_track_reminder.js index a4d86dd9452..18fc3a4ab2e 100644 --- a/addons/website_event_track/static/src/js/event_track_reminder.js +++ b/addons/website_event_track/static/src/js/event_track_reminder.js @@ -55,7 +55,7 @@ publicWidget.registry.websiteEventTrackReminder = publicWidget.Widget.extend({ }); } else { self.reminderOn = reminderOnValue; - var reminderText = self.reminderOn ? _t('Reminder On') : _t('Set Reminder'); + var reminderText = self.reminderOn ? _t('Favorite On') : _t('Set Favorite'); self.$('.o_wetrack_js_reminder_text').text(reminderText); self._updateDisplay(); var message = self.reminderOn ? _t('Talk added to your Favorites') : _t('Talk removed from your Favorites'); @@ -74,10 +74,10 @@ publicWidget.registry.websiteEventTrackReminder = publicWidget.Widget.extend({ var $trackLink = this.$el.find('i'); if (this.reminderOn) { $trackLink.addClass('fa-bell').removeClass('fa-bell-o'); - $trackLink.attr('title', _t('Reminder On')); + $trackLink.attr('title', _t('Favorite On')); } else { $trackLink.addClass('fa-bell-o').removeClass('fa-bell'); - $trackLink.attr('title', _t('Set Reminder')); + $trackLink.attr('title', _t('Set Favorite')); } }, diff --git a/addons/website_event_track/tests/test_website_event.py b/addons/website_event_track/tests/test_website_event.py index 1fedaf2d428..233018d449a 100644 --- a/addons/website_event_track/tests/test_website_event.py +++ b/addons/website_event_track/tests/test_website_event.py @@ -63,13 +63,23 @@ class TestEventWebsiteTrack(TestWebsiteEventCommon): self._assert_website_menus(event, set(['Location', 'Register', 'Community'])) event.write({'website_track_proposal': True}) + self.assertFalse(event.website_track) + self.assertTrue(event.website_track_proposal) + self._assert_website_menus(event, set(['Location', 'Register', 'Community', 'Talk Proposals'])) + + event.write({'website_track': True}) self.assertTrue(event.website_track) self.assertTrue(event.website_track_proposal) self._assert_website_menus(event, set(['Location', 'Register', 'Community', 'Talks', 'Agenda', 'Talk Proposals'])) @users('user_eventmanager') def test_write_menu(self): - event = self.env['event.event'].browse(self.event_0.id) + event = self.env['event.event'].create({ + 'name': 'TestEvent', + 'date_begin': fields.Datetime.to_string(datetime.today() + timedelta(days=1)), + 'date_end': fields.Datetime.to_string(datetime.today() + timedelta(days=15)), + 'website_menu': False, + }) self.assertFalse(event.menu_id) event.write({ 'website_menu': True, diff --git a/addons/website_event_track/views/event_track_templates_list.xml b/addons/website_event_track/views/event_track_templates_list.xml index 85059f44c71..505a68ef4aa 100644 --- a/addons/website_event_track/views/event_track_templates_list.xml +++ b/addons/website_event_track/views/event_track_templates_list.xml @@ -38,7 +38,7 @@
  • - Wishlist + Favorites
    - Wishlisted + Favorites
    • diff --git a/addons/website_event_track/views/event_track_templates_reminder.xml b/addons/website_event_track/views/event_track_templates_reminder.xml index 5731dc81ce7..df996d5abd6 100644 --- a/addons/website_event_track/views/event_track_templates_reminder.xml +++ b/addons/website_event_track/views/event_track_templates_reminder.xml @@ -10,15 +10,17 @@
    + Favorite On + Set Favorite - Set Reminder + Set Favorite - Reminder On + Favorite On
    diff --git a/addons/website_event_track_exhibitor/controllers/exhibitor.py b/addons/website_event_track_exhibitor/controllers/exhibitor.py index 08fb71862cf..e163b4dba4f 100644 --- a/addons/website_event_track_exhibitor/controllers/exhibitor.py +++ b/addons/website_event_track_exhibitor/controllers/exhibitor.py @@ -72,7 +72,7 @@ class ExhibitorController(EventTrackController): sponsors = request.env['event.sponsor'].sudo().search(search_domain) sponsors_all = request.env['event.sponsor'].sudo().search(search_domain_base) sponsor_types = sponsors_all.mapped('sponsor_type_id') - sponsor_countries = sponsors_all.mapped('partner_id.country_id') + sponsor_countries = sponsors_all.mapped('partner_id.country_id').sorted('name') # organize sponsors into categories to help display sponsor_categories = dict() for sponsor in sponsors: diff --git a/addons/website_event_track_exhibitor/models/event_event.py b/addons/website_event_track_exhibitor/models/event_event.py index 49081272586..acb75f24152 100644 --- a/addons/website_event_track_exhibitor/models/event_event.py +++ b/addons/website_event_track_exhibitor/models/event_event.py @@ -20,7 +20,7 @@ class EventEvent(models.Model): for event in self: if event.event_type_id and event.event_type_id != event._origin.event_type_id: event.exhibitor_menu = event.event_type_id.exhibitor_menu - elif event.website_menu and event.website_menu != event._origin.website_menu or not event.exhibitor_menu: + elif event.website_menu and (event.website_menu != event._origin.website_menu or not event.exhibitor_menu): event.exhibitor_menu = True elif not event.website_menu: event.exhibitor_menu = False @@ -38,7 +38,7 @@ class EventEvent(models.Model): def _update_website_menus(self, menus_update_by_field=None): super(EventEvent, self)._update_website_menus(menus_update_by_field=menus_update_by_field) for event in self: - if not menus_update_by_field or event in menus_update_by_field.get('exhibitor_menu'): + if event.menu_id and (not menus_update_by_field or event in menus_update_by_field.get('exhibitor_menu')): event._update_website_menu_entry('exhibitor_menu', 'exhibitor_menu_ids', '_get_exhibitor_menu_entries') def _get_menu_type_field_matching(self): diff --git a/addons/website_event_track_exhibitor/static/src/xml/event_exhibitor_connect.xml b/addons/website_event_track_exhibitor/static/src/xml/event_exhibitor_connect.xml index 31979df4de8..bb117147ad7 100644 --- a/addons/website_event_track_exhibitor/static/src/xml/event_exhibitor_connect.xml +++ b/addons/website_event_track_exhibitor/static/src/xml/event_exhibitor_connect.xml @@ -51,7 +51,8 @@ - diff --git a/addons/website_event_track_exhibitor/views/event_exhibitor_templates_list.xml b/addons/website_event_track_exhibitor/views/event_exhibitor_templates_list.xml index 72fb15570a5..39aeaa413b3 100644 --- a/addons/website_event_track_exhibitor/views/event_exhibitor_templates_list.xml +++ b/addons/website_event_track_exhibitor/views/event_exhibitor_templates_list.xml @@ -100,7 +100,7 @@
    - All Countries + All Sponsorships - - https://www.youtube.com/watch?v=66AIsiezq5g - - - - https://www.youtube.com/watch?v=IvUU8joBb1Q - - + https://www.youtube.com/watch?v=qRrA8al77a0 - - - - https://www.youtube.com/watch?v=bZ-queeu-lk - + - https://www.youtube.com/watch?v=gV3g5FzmQiM - + + https://www.youtube.com/watch?v=bZ-queeu-lk + - https://www.youtube.com/watch?v=g3IoL9hxABg - + + https://www.youtube.com/watch?v=gV3g5FzmQiM + - - - https://www.youtube.com/watch?v=AVZtyXJB-rI - - - - https://www.youtube.com/watch?v=LHztthKy4RE - - - - https://www.youtube.com/watch?v=B-nEYsyRlYo - + + + https://www.youtube.com/watch?v=loP-Nd7M5s8 + - https://www.youtube.com/watch?v=7X8xuipr4_A - + + https://www.youtube.com/watch?v=qRrA8al77a0 + + + + + https://www.youtube.com/watch?v=66AIsiezq5g + + + + + https://www.youtube.com/watch?v=OE4BVOjJp88 + + + + + https://www.youtube.com/watch?v=3cME3vK1aaQ + + + + + https://www.youtube.com/watch?v=7X8xuipr4_A + + + + + https://www.youtube.com/watch?v=3pc-nnAykTQ + + + + + https://www.youtube.com/watch?v=tI5zCo-zLkY + - diff --git a/addons/website_event_track_quiz/__manifest__.py b/addons/website_event_track_quiz/__manifest__.py index e1e71980282..810e538146c 100644 --- a/addons/website_event_track_quiz/__manifest__.py +++ b/addons/website_event_track_quiz/__manifest__.py @@ -25,6 +25,7 @@ 'views/event_menus.xml', 'views/event_quiz_templates.xml', 'views/event_track_templates_page.xml', + 'views/event_event_views.xml', 'views/event_type_views.xml' ], 'demo': [ diff --git a/addons/website_event_track_quiz/models/__init__.py b/addons/website_event_track_quiz/models/__init__.py index dd66c4ecd9e..078488231e0 100644 --- a/addons/website_event_track_quiz/models/__init__.py +++ b/addons/website_event_track_quiz/models/__init__.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. +from . import event_event from . import event_track from . import event_track_visitor from . import event_quiz diff --git a/addons/website_event_track_quiz/models/event_event.py b/addons/website_event_track_quiz/models/event_event.py new file mode 100644 index 00000000000..9ef2a289c08 --- /dev/null +++ b/addons/website_event_track_quiz/models/event_event.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import api, fields, models + + +class Event(models.Model): + _inherit = "event.event" + + @api.depends("event_type_id", "website_menu", "community_menu") + def _compute_community_menu(self): + """ At type onchange: synchronize. At website_menu update: synchronize. """ + for event in self: + if event.event_type_id and event.event_type_id != event._origin.event_type_id: + event.community_menu = event.event_type_id.community_menu + elif event.website_menu and (event.website_menu != event._origin.website_menu or not event.community_menu): + event.community_menu = True + elif not event.website_menu: + event.community_menu = False diff --git a/addons/website_event_track_quiz/views/event_event_views.xml b/addons/website_event_track_quiz/views/event_event_views.xml new file mode 100644 index 00000000000..66419e8d95f --- /dev/null +++ b/addons/website_event_track_quiz/views/event_event_views.xml @@ -0,0 +1,19 @@ + + + + + event.event.view.form.inherit.track.quiz + event.event + + + + 0 + + + + + + + + + diff --git a/addons/website_event_track_quiz/views/event_type_views.xml b/addons/website_event_track_quiz/views/event_type_views.xml index 5f5e01a0d58..460a5e5bf5b 100644 --- a/addons/website_event_track_quiz/views/event_type_views.xml +++ b/addons/website_event_track_quiz/views/event_type_views.xml @@ -1,12 +1,12 @@ - event.type.view.form.inherit.meet + event.type.view.form.inherit.track.quiz event.type - + {'invisible': [('website_menu', '=', False)]}