From a48f5a3736551e41b112ac2edede0041af166c00 Mon Sep 17 00:00:00 2001 From: std-odoo Date: Wed, 25 Nov 2020 09:17:10 +0000 Subject: [PATCH] [IMP] event_*: allow Event Users to manage the events from website Purpose ======= Before, the Event Manager could make some action on the frontend size, like joining full meeting room, see unpublished track... Now, the Event User has more permissions and can create Event, Track... So, we want also to change the logic on the frontend side and allow him to do the same actions as the Event Manager. Task ID-2204364 COM odoo/odoo#57022 ENT odoo/enterprise#13984 UPG odoo/upgrade#1897 --- .../website_event_exhibitor/controllers/exhibitor.py | 6 +++--- .../views/event_exhibitor_templates_list.xml | 6 +++--- addons/website_event_meet/controllers/community.py | 8 ++++---- .../views/event_meet_templates_list.xml | 10 +++++----- .../views/event_meet_templates_page.xml | 4 ++-- addons/website_event_track/controllers/event_track.py | 6 +++--- .../views/event_track_templates_agenda.xml | 6 +++--- .../views/event_track_templates_list.xml | 4 ++-- .../views/event_track_templates_page.xml | 2 +- .../views/event_track_templates_list.xml | 2 +- .../static/src/js/event_quiz.js | 2 +- .../static/src/xml/quiz_templates.xml | 2 +- .../views/event_quiz_templates.xml | 2 +- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/addons/website_event_exhibitor/controllers/exhibitor.py b/addons/website_event_exhibitor/controllers/exhibitor.py index d42cd596278..ce8d6db66ed 100644 --- a/addons/website_event_exhibitor/controllers/exhibitor.py +++ b/addons/website_event_exhibitor/controllers/exhibitor.py @@ -104,7 +104,7 @@ class ExhibitorController(WebsiteEventController): 'sponsor_countries': sponsor_countries, # environment 'hostname': request.httprequest.host.split(':')[0], - 'user_event_manager': request.env.user.has_group('event.group_event_manager'), + 'is_event_user': request.env.user.has_group('event.group_event_user'), } # ------------------------------------------------------------ @@ -158,10 +158,10 @@ class ExhibitorController(WebsiteEventController): 'sponsors_other': sponsors_other[:30], # options 'option_widescreen': option_widescreen, - 'option_can_edit': request.env.user.has_group('event.group_event_manager'), + 'option_can_edit': request.env.user.has_group('event.group_event_user'), # environment 'hostname': request.httprequest.host.split(':')[0], - 'user_event_manager': request.env.user.has_group('event.group_event_manager'), + 'is_event_user': request.env.user.has_group('event.group_event_user'), } # ------------------------------------------------------------ diff --git a/addons/website_event_exhibitor/views/event_exhibitor_templates_list.xml b/addons/website_event_exhibitor/views/event_exhibitor_templates_list.xml index cbc22dc98bc..db7cb647fcc 100644 --- a/addons/website_event_exhibitor/views/event_exhibitor_templates_list.xml +++ b/addons/website_event_exhibitor/views/event_exhibitor_templates_list.xml @@ -162,7 +162,7 @@ t-att-data-sponsor-id="sponsor.id" t-att-data-event-is-ongoing="sponsor.event_id.is_ongoing" t-att-data-sponsor-is-ongoing="sponsor.is_in_opening_hours" - t-att-data-user-event-manager="user_event_manager"> + t-att-data-user-event-manager="is_event_user">
@@ -170,7 +170,7 @@
- + Register Connect @@ -190,7 +190,7 @@
- + Register Connect diff --git a/addons/website_event_meet/controllers/community.py b/addons/website_event_meet/controllers/community.py index 7cacd959006..6405b1ce32f 100644 --- a/addons/website_event_meet/controllers/community.py +++ b/addons/website_event_meet/controllers/community.py @@ -51,8 +51,8 @@ class WebsiteEventMeetController(EventCommunityController): meeting_rooms = request.env['event.meeting.room'].sudo().search(search_domain) meeting_rooms = meeting_rooms.sorted(self._sort_event_rooms, reverse=True) - is_event_manager = request.env.user.has_group("event.group_event_manager") - if not is_event_manager: + is_event_user = request.env.user.has_group("event.group_event_user") + if not is_event_user: meeting_rooms = meeting_rooms.filtered(lambda m: not m.room_is_full) visitor = request.env['website.visitor']._get_visitor_from_request() @@ -68,7 +68,7 @@ class WebsiteEventMeetController(EventCommunityController): "default_lang_code": request.context.get('lang', request.env.user.lang), "default_username": visitor.display_name if visitor else None, # environment - "is_event_manager": is_event_manager, + "is_event_user": is_event_user, } @http.route("/event//meeting_room_create", @@ -155,5 +155,5 @@ class WebsiteEventMeetController(EventCommunityController): 'meeting_rooms_other': meeting_rooms_other, # options 'option_widescreen': True, - 'is_event_manager': request.env.user.has_group('event.group_event_manager'), + 'is_event_user': request.env.user.has_group('event.group_event_manager'), } diff --git a/addons/website_event_meet/views/event_meet_templates_list.xml b/addons/website_event_meet/views/event_meet_templates_list.xml index a6b7d5b9c35..085a36d34ba 100644 --- a/addons/website_event_meet/views/event_meet_templates_list.xml +++ b/addons/website_event_meet/views/event_meet_templates_list.xml @@ -95,7 +95,7 @@
- + @@ -110,10 +110,10 @@ -

-
+