From 0948870e7da23095a0e79cb464cc587259c092fa Mon Sep 17 00:00:00 2001 From: std-odoo Date: Wed, 4 Nov 2020 13:36:16 +0000 Subject: [PATCH 1/2] [MOV] event: move the security tests to "Test Event Full" Purpose ======= Move the security tests of event to "Test Event Full", so if we change the ACLs in a sub-modules, we are sure to test it. Task 2204364 PR odoo/odoo/pull/65867 Migration odoo/upgrade/pull/2150 --- addons/event/tests/__init__.py | 1 - addons/test_event_full/tests/__init__.py | 1 + addons/{event => test_event_full}/tests/test_event_security.py | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename addons/{event => test_event_full}/tests/test_event_security.py (100%) diff --git a/addons/event/tests/__init__.py b/addons/event/tests/__init__.py index 72c2d9abfd9f9..881edfc8974f4 100644 --- a/addons/event/tests/__init__.py +++ b/addons/event/tests/__init__.py @@ -4,4 +4,3 @@ from . import test_event_flow from . import test_event_internals from . import test_event_mail_schedule -from . import test_event_security diff --git a/addons/test_event_full/tests/__init__.py b/addons/test_event_full/tests/__init__.py index 7011f22b294f8..f08227d67fee0 100644 --- a/addons/test_event_full/tests/__init__.py +++ b/addons/test_event_full/tests/__init__.py @@ -4,3 +4,4 @@ from . import common from . import test_event_crm from . import test_wevent_register +from . import test_event_security diff --git a/addons/event/tests/test_event_security.py b/addons/test_event_full/tests/test_event_security.py similarity index 100% rename from addons/event/tests/test_event_security.py rename to addons/test_event_full/tests/test_event_security.py From d1125288e2d70ea373d4df0b5850a74ff284e3d6 Mon Sep 17 00:00:00 2001 From: std-odoo Date: Wed, 4 Nov 2020 12:42:30 +0000 Subject: [PATCH 2/2] [REF] event_*: clean the ACLs files to be consistent in all sub-modules Purpose ======= In event, many files have different naming format. We want to clean them, to group the lines by models before changing and adding a new event group. Task 2204364 PR odoo/odoo/pull/65867 Migration odoo/upgrade/pull/2150 --- addons/event/security/ir.model.access.csv | 48 +++++++++---------- addons/event_crm/security/ir.model.access.csv | 6 +-- .../security/ir.model.access.csv | 12 ++--- .../security/ir.model.access.csv | 10 ++-- .../security/ir.model.access.csv | 10 ++-- .../security/ir.model.access.csv | 28 +++++------ 6 files changed, 57 insertions(+), 57 deletions(-) diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv index 3bc63e6c9e48f..7a59e98493422 100644 --- a/addons/event/security/ir.model.access.csv +++ b/addons/event/security/ir.model.access.csv @@ -1,24 +1,24 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_event_type,event.type,model_event_type,event.group_event_user,1,0,0,0 -access_event_type_manager,event.type manager,model_event_type,event.group_event_manager,1,1,1,1 -access_event_type_ticket,event.type.ticket.user,model_event_type_ticket,event.group_event_user,1,0,0,0 -access_event_type_ticket_manager,event.type.ticket.manager,model_event_type_ticket,event.group_event_manager,1,1,1,1 -access_event_event_portal,event.event.portal,model_event_event,,1,0,0,0 -access_event_event_user,event.event.user,model_event_event,event.group_event_user,1,0,0,0 -access_event_event_manager,event.event.manager,model_event_event,event.group_event_manager,1,1,1,1 -access_event_event_ticket_user,event.event.ticket.user,model_event_event_ticket,event.group_event_user,1,0,0,0 -access_event_event_ticket_manager,event.event.ticket.manager,model_event_event_ticket,event.group_event_manager,1,1,1,1 -access_event_registration,event.registration,model_event_registration,event.group_event_user,1,1,1,1 -access_event_registration_all,event.registration,model_event_registration,,0,0,0,0 -access_event_mail,event.mail,model_event_mail,event.group_event_user,1,0,0,0 -access_event_mail_manager,event.mail manager,model_event_mail,event.group_event_manager,1,1,1,1 -access_event_mail_registration,event.mail.registration,model_event_mail_registration,event.group_event_user,1,0,0,0 -access_event_mail_registration_manager,event.mail.registration.manager,model_event_mail_registration,event.group_event_manager,1,1,1,1 -access_event_type_mail_event_user,event.type.mail.event.user,model_event_type_mail,event.group_event_user,1,0,0,0 -access_event_type_mail_event_manager,event.type.mail.event.manager,model_event_type_mail,event.group_event_manager,1,1,1,1 -access_event_stage_user,event.stage.user,model_event_stage,event.group_event_user,1,1,1,1 -access_event_stage_manager,event.stage.manager,model_event_stage,event.group_event_manager,1,1,1,1 -access_event_category,event.tag.category,model_event_tag_category,event.group_event_user,1,0,0,0 -access_event_category_manager,event.tag.category manager,model_event_tag_category,event.group_event_manager,1,1,1,1 -access_event_tag,event.tag,model_event_tag,event.group_event_user,1,1,0,0 -access_event_tag_manager,event.tag manager,model_event_tag,event.group_event_manager,1,1,1,1 +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_event_type_user,event.type.user,model_event_type,event.group_event_user,1,0,0,0 +access_event_type_manager,event.type.manager,model_event_type,event.group_event_manager,1,1,1,1 +access_event_type_ticket_user,event.type.ticket.user,model_event_type_ticket,event.group_event_user,1,0,0,0 +access_event_type_ticket_manager,event.type.ticket.manager,model_event_type_ticket,event.group_event_manager,1,1,1,1 +access_event_event,event.event,model_event_event,,1,0,0,0 +access_event_event_user,event.event.user,model_event_event,event.group_event_user,1,0,0,0 +access_event_event_manager,event.event.manager,model_event_event,event.group_event_manager,1,1,1,1 +access_event_event_ticket_user,event.event.ticket.user,model_event_event_ticket,event.group_event_user,1,0,0,0 +access_event_event_ticket_manager,event.event.ticket.manager,model_event_event_ticket,event.group_event_manager,1,1,1,1 +access_event_registration_user,event.registration.user,model_event_registration,event.group_event_user,1,1,1,1 +access_event_registration,event.registration,model_event_registration,,0,0,0,0 +access_event_mail_user,event.mail.user,model_event_mail,event.group_event_user,1,0,0,0 +access_event_mail_manager,event.mail.manager,model_event_mail,event.group_event_manager,1,1,1,1 +access_event_mail_registration_user,event.mail.registration.user,model_event_mail_registration,event.group_event_user,1,0,0,0 +access_event_mail_registration_manager,event.mail.registration.manager,model_event_mail_registration,event.group_event_manager,1,1,1,1 +access_event_type_mail_user,event.type.mail.user,model_event_type_mail,event.group_event_user,1,0,0,0 +access_event_type_mail_manager,event.type.mail.manager,model_event_type_mail,event.group_event_manager,1,1,1,1 +access_event_stage_user,event.stage.user,model_event_stage,event.group_event_user,1,1,1,1 +access_event_stage_manager,event.stage.manager,model_event_stage,event.group_event_manager,1,1,1,1 +access_event_tag_category_user,event.tag.category.user,model_event_tag_category,event.group_event_user,1,0,0,0 +access_event_tag_category_manager,event.tag.category.manager,model_event_tag_category,event.group_event_manager,1,1,1,1 +access_event_tag_user,event.tag.user,model_event_tag,event.group_event_user,1,1,0,0 +access_event_tag_manager,event.tag.manager,model_event_tag,event.group_event_manager,1,1,1,1 diff --git a/addons/event_crm/security/ir.model.access.csv b/addons/event_crm/security/ir.model.access.csv index c1ed5ff7d698f..680057dbb4b1d 100644 --- a/addons/event_crm/security/ir.model.access.csv +++ b/addons/event_crm/security/ir.model.access.csv @@ -1,4 +1,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_event_crm_manager,event.crm.manager,model_event_lead_rule,event.group_event_manager,1,1,1,1 -access_event_crm_user,event.crm.user,model_event_lead_rule,event.group_event_user,1,0,0,0 -access_event_crm_salesman,event.crm.user,model_event_lead_rule,sales_team.group_sale_salesman,1,0,0,0 +access_event_crm_manager,event.lead.rule.manager,model_event_lead_rule,event.group_event_manager,1,1,1,1 +access_event_crm_user,event.lead.rule.user,model_event_lead_rule,event.group_event_user,1,0,0,0 +access_event_crm_salesman,event.lead.rule.salesman,model_event_lead_rule,sales_team.group_sale_salesman,1,0,0,0 diff --git a/addons/website_event/security/ir.model.access.csv b/addons/website_event/security/ir.model.access.csv index 491250829098f..44b13e4f59c13 100644 --- a/addons/website_event/security/ir.model.access.csv +++ b/addons/website_event/security/ir.model.access.csv @@ -1,11 +1,11 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_event_event_public,event.event.public,event.model_event_event,base.group_public,1,0,0,0 access_event_event_portal,event.event.portal,event.model_event_event,base.group_portal,1,0,0,0 -access_event_type_public,event.type.public,event.model_event_type,,0,0,0,0 +access_event_type,event.type,event.model_event_type,,0,0,0,0 access_event_event_ticket_public,event.event.ticket.public,event.model_event_event_ticket,base.group_public,1,0,0,0 access_event_event_ticket_portal,event.event.ticket.portal,event.model_event_event_ticket,base.group_portal,1,0,0,0 -access_event_category_public,event.tag.category.public,event.model_event_tag_category,,1,0,0,0 -access_event_tag_public,event.tag.public,event.model_event_tag,,1,0,0,0 -access_website_event_menu_public,website.event.menu,model_website_event_menu,,1,0,0,0 -access_website_event_menu_manager,website.event.menu,model_website_event_menu,event.group_event_manager,1,1,1,1 -website_visitor_access_event_user,website.visitor.access.event.user,model_website_visitor,event.group_event_user,1,1,0,0 +access_event_tag_category,event.tag.category,event.model_event_tag_category,,1,0,0,0 +access_event_tag,event.tag,event.model_event_tag,,1,0,0,0 +access_website_event_menu,website.event.menu,model_website_event_menu,,1,0,0,0 +access_website_event_menu_manager,website.event.menu.manager,model_website_event_menu,event.group_event_manager,1,1,1,1 +access_website_visitor_user,website.visitor.user,model_website_visitor,event.group_event_user,1,1,0,0 diff --git a/addons/website_event_meet/security/ir.model.access.csv b/addons/website_event_meet/security/ir.model.access.csv index eeae56fb6a0df..c7a4cdc7459e5 100644 --- a/addons/website_event_meet/security/ir.model.access.csv +++ b/addons/website_event_meet/security/ir.model.access.csv @@ -1,6 +1,6 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -event_meeting_room_access_all,event.meeting.room.access.all,model_event_meeting_room,,1,0,0,0 -event_meeting_room_access_user,event.meeting.room.access.user,model_event_meeting_room,event.group_event_user,1,0,0,0 -event_meeting_room_access_manager,event.meeting.room.access.manager,model_event_meeting_room,event.group_event_manager,1,1,1,1 -chat_room_access_event_user,chat.room.access.event.user,website_jitsi.model_chat_room,event.group_event_user,1,0,0,0 -chat_room_access_event_manager,chat.room.access.event.manager,website_jitsi.model_chat_room,event.group_event_manager,1,1,1,1 +access_event_meeting_room,event.meeting.room,model_event_meeting_room,,1,0,0,0 +access_event_meeting_room_user,event.meeting.room.user,model_event_meeting_room,event.group_event_user,1,0,0,0 +access_event_meeting_room_manager,event.meeting.room.manager,model_event_meeting_room,event.group_event_manager,1,1,1,1 +access_chat_room_user,chat.room.user,website_jitsi.model_chat_room,event.group_event_user,1,0,0,0 +access_chat_room_manager,chat.room.manager,website_jitsi.model_chat_room,event.group_event_manager,1,1,1,1 diff --git a/addons/website_event_questions/security/ir.model.access.csv b/addons/website_event_questions/security/ir.model.access.csv index ea509ea3f856e..50ff4014e58c0 100644 --- a/addons/website_event_questions/security/ir.model.access.csv +++ b/addons/website_event_questions/security/ir.model.access.csv @@ -1,6 +1,6 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -event_question_all,event.question.all,model_event_question,,1,0,0,0 -event_question_event_user,event.question.event.user,model_event_question,event.group_event_user,1,1,1,1 -event_question_answer_all,event.question.answer.all,model_event_question_answer,,1,0,0,0 -event_question_answer_event_user,event.question.answer.event.user,model_event_question_answer,event.group_event_user,1,1,1,1 -event_registration_answer_event_user,event.registration.answer.event.user,model_event_registration_answer,event.group_event_user,1,1,1,1 +access_event_question,event.question,model_event_question,,1,0,0,0 +access_event_question_user,event.question.user,model_event_question,event.group_event_user,1,1,1,1 +access_event_question_answer,event.question.answer,model_event_question_answer,,1,0,0,0 +access_event_question_answer_user,event.question.answer.user,model_event_question_answer,event.group_event_user,1,1,1,1 +access_event_registration_answer_user,event.registration.answer.user,model_event_registration_answer,event.group_event_user,1,1,1,1 diff --git a/addons/website_event_track/security/ir.model.access.csv b/addons/website_event_track/security/ir.model.access.csv index 0b8137f02db53..6057bb5211562 100644 --- a/addons/website_event_track/security/ir.model.access.csv +++ b/addons/website_event_track/security/ir.model.access.csv @@ -1,14 +1,14 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_event_track_manager,event.track manager,model_event_track,event.group_event_manager,1,1,1,1 -access_event_track_tag_public,event.track.tag public,model_event_track_tag,,1,0,0,0 -access_event_track_tag_user,event.track.tag public,model_event_track_tag,event.group_event_user,1,1,0,0 -access_event_track_tag_manager,event.track.tag manager,model_event_track_tag,event.group_event_manager,1,1,1,1 -access_event_track_location_public,event.track.location public,model_event_track_location,,1,0,0,0 -access_event_track_location_manager,event.track.location manager,model_event_track_location,event.group_event_manager,1,1,1,1 -access_event_track__public,event.track.public,model_event_track,,1,0,0,0 -access_event_track_stage_all,event.track.stage.all,model_event_track_stage,,1,0,0,0 -access_event_track_stage_event_manager,event.track.stage.event.manager,model_event_track_stage,event.group_event_manager,1,1,1,1 -event_track_visitor_access_all,event.track.visitor.access.all,model_event_track_visitor,,0,0,0,0 -event_track_visitor_access_manager,event.track.visitor.access.manager,model_event_track_visitor,event.group_event_manager,1,1,1,1 -event_track_tag_category_access_public,event.track.tag.category.access,model_event_track_tag_category,,1,0,0,0 -event_track_tag_category_access_manager,event.track.tag.category.access.manager,model_event_track_tag_category,event.group_event_manager,1,1,1,1 \ No newline at end of file +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_event_track_manager,event.track.manager,model_event_track,event.group_event_manager,1,1,1,1 +access_event_track,event.track,model_event_track,,1,0,0,0 +access_event_track_tag,event.track.tag,model_event_track_tag,,1,0,0,0 +access_event_track_tag_user,event.track.tag.user,model_event_track_tag,event.group_event_user,1,1,0,0 +access_event_track_tag_manager,event.track.tag.manager,model_event_track_tag,event.group_event_manager,1,1,1,1 +access_event_track_location,event.track.location,model_event_track_location,,1,0,0,0 +access_event_track_location_manager,event.track.location.manager,model_event_track_location,event.group_event_manager,1,1,1,1 +access_event_track_stage,event.track.stage,model_event_track_stage,,1,0,0,0 +access_event_track_stage_manager,event.track.stage.manager,model_event_track_stage,event.group_event_manager,1,1,1,1 +access_event_track_visitor,event.track.visitor,model_event_track_visitor,,0,0,0,0 +access_event_track_visitor_manager,event.track.visitor.manager,model_event_track_visitor,event.group_event_manager,1,1,1,1 +access_event_track_tag_category,event.track.tag.category,model_event_track_tag_category,,1,0,0,0 +access_event_track_tag_category_manager,event.track.tag.category.manager,model_event_track_tag_category,event.group_event_manager,1,1,1,1