diff options
| author | Thibault Delavallée <tde@odoo.com> | 2020-08-21 08:54:27 +0000 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2020-08-24 10:16:35 +0000 |
| commit | db4eda03849599f22277af00565aac603c747a2e (patch) | |
| tree | 3391a54c3adefb8573eb567acbad70f4e94033dd | |
| parent | b183077d56420579b6d118acbeaa5f9015290dda (diff) | |
[FIX] website_event_track_exhibitor: fix frontend menu glitches
SPECIFICATIONS
Fix ordering of countries: to be displayed by name
Fix 'all sponsorships' top menu entry in sponsorship filter. It is
called 'all countries', probably a copy-and-paste from country menu.
Fix display of modal when exhibitor is not online: if no country flag has
been found, avoid displaying a broken image.
UPDATE
* website_event_track_exhibitor.exhibitors_topbar_sponsorship
LINKS
Task ID-2314778 (event online fixes)
PR #56340
X-Original-PR #56254
X-Original-Commit odoo/odoo@b2d203e85ce1c72471d7c4c70f550f11818230d7
3 files changed, 4 insertions, 3 deletions
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/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 @@ <i class="fa fa-phone mr-2"/><span t-esc="widget.sponsorData.phone"/> </span> </div> - <img class="img ml-auto" + <img t-if="widget.sponsorData.country_flag_url" + class="img ml-auto" style="max-height: 36px;" t-att-src="widget.sponsorData.country_flag_url" t-att-alt="widget.sponsorData.country_name"/> 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 @@ <div class="dropdown-menu"> <a t-att-href="'/event/%s/exhibitors?%s' % (slug(event), keep_query('*', sponsorships=''))" t-attf-class="dropdown-item d-flex align-items-center justify-content-between #{'active' if not search_sponsorships else ''}"> - All Countries + All Sponsorships </a> <t t-foreach="sponsor_types" t-as="sponsor_type"> <a t-att-href="'/event/%s/exhibitors?%s' % ( |