From f03e7cfd8ba0a57558ab8e0b6542ec715cb0868f Mon Sep 17 00:00:00 2001 From: Fabien Bourgeois Date: Fri, 22 Jul 2016 07:29:16 +0200 Subject: [PATCH] [IMP]GOLEM Security several improvements --- golem_base/security/golem_security.xml | 15 +++++++++++++++ golem_member/models/golem_member.py | 3 +-- golem_member/views/golem_member_view.xml | 2 +- golem_member_skills/views/golem_member_view.xml | 2 +- golem_season/security/ir.model.access.csv | 2 +- golem_season/views/golem_season_view.xml | 2 +- 6 files changed, 20 insertions(+), 6 deletions(-) diff --git a/golem_base/security/golem_security.xml b/golem_base/security/golem_security.xml index 157c86f..14a2b4e 100644 --- a/golem_base/security/golem_security.xml +++ b/golem_base/security/golem_security.xml @@ -34,5 +34,20 @@ along with this program. If not, see . + + + + + + + + + + + + diff --git a/golem_member/models/golem_member.py b/golem_member/models/golem_member.py index ddb4465..1f194e8 100644 --- a/golem_member/models/golem_member.py +++ b/golem_member/models/golem_member.py @@ -66,8 +66,7 @@ class GolemMember(models.Model): pictures_agreement = fields.Boolean('Pictures agreement?') opt_out_sms = fields.Boolean('Out of SMS campaigns') season_ids = fields.Many2many('golem.season', string='Seasons', - required=True, auto_join=True, - default=_default_season, + required=True, default=_default_season, ondelete='restrict') is_current = fields.Boolean('Current user?', default=False, readonly=True, store=True, compute='_compute_is_current') diff --git a/golem_member/views/golem_member_view.xml b/golem_member/views/golem_member_view.xml index 8e60754..83829ab 100644 --- a/golem_member/views/golem_member_view.xml +++ b/golem_member/views/golem_member_view.xml @@ -113,7 +113,7 @@ along with this program. If not, see . golem.member - + diff --git a/golem_member_skills/views/golem_member_view.xml b/golem_member_skills/views/golem_member_view.xml index bec7dc0..2465252 100644 --- a/golem_member_skills/views/golem_member_view.xml +++ b/golem_member_skills/views/golem_member_view.xml @@ -61,7 +61,7 @@ along with this program. If not, see . name="Member skills" parent="base.menu_marketing_config_association" action="skills_action_list" - sequence="5" /> + sequence="5" groups="golem_base.group_golem_manager" /> diff --git a/golem_season/security/ir.model.access.csv b/golem_season/security/ir.model.access.csv index 331bf24..48e37ae 100644 --- a/golem_season/security/ir.model.access.csv +++ b/golem_season/security/ir.model.access.csv @@ -1,3 +1,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_golem_season_user,Access GOLEM Season User,model_golem_season,golem_base.group_golem_user,1,0,0,0 +access_golem_season_user,Access GOLEM Season User,model_golem_season,golem_base.group_golem_user,1,1,0,0 access_golem_season_manager,Access GOLEM Season Manager,model_golem_season,golem_base.group_golem_manager,1,1,1,1 diff --git a/golem_season/views/golem_season_view.xml b/golem_season/views/golem_season_view.xml index 9ea9fd9..a2f908f 100644 --- a/golem_season/views/golem_season_view.xml +++ b/golem_season/views/golem_season_view.xml @@ -77,7 +77,7 @@ along with this program. If not, see . + action="action_list" groups="golem_base.group_golem_manager" />