diff --git a/addons/gamification/plan.py b/addons/gamification/plan.py index 7819d38cb3b..ffd39b3c739 100644 --- a/addons/gamification/plan.py +++ b/addons/gamification/plan.py @@ -102,7 +102,7 @@ class gamification_goal_plan(osv.Model): string='Users', help="List of users to which the goal will be set"), 'manager_id': fields.many2one('res.users', required=True, - string='Manager', help="The user responsible for the plan."), + string='Responsible', help="The user responsible for the plan."), 'planline_ids': fields.one2many('gamification.goal.planline', 'plan_id', string='Planline', diff --git a/addons/gamification/plan_view.xml b/addons/gamification/plan_view.xml index 2c5828368ee..024d01c4c53 100644 --- a/addons/gamification/plan_view.xml +++ b/addons/gamification/plan_view.xml @@ -68,7 +68,7 @@ - + diff --git a/addons/gamification/security/gamification_security.xml b/addons/gamification/security/gamification_security.xml index 23ec3679add..227d8e21584 100644 --- a/addons/gamification/security/gamification_security.xml +++ b/addons/gamification/security/gamification_security.xml @@ -13,16 +13,22 @@ - + - User can only see his/her goals + + User can only see his/her goals or goal from the same plan in board visibility - [('user_id','=',user.id)] + [ + '|', + ('user_id','=',user.id), + '&', + ('plan_id.user_ids','in',user.id), + ('plan_id.visibility_mode','=','board')] Manager has all rights on user's goals diff --git a/addons/gamification/security/ir.model.access.csv b/addons/gamification/security/ir.model.access.csv index 803294832b1..52ea42e09e3 100644 --- a/addons/gamification/security/ir.model.access.csv +++ b/addons/gamification/security/ir.model.access.csv @@ -5,9 +5,9 @@ goal_user,"Goal User",model_gamification_goal,base.group_user,1,1,0,0 goal_type_manager,"Goal Type Manager",model_gamification_goal_type,group_goal_manager,1,1,1,1 goal_type_anybody,"Goal Type Anybody",model_gamification_goal_type,,1,0,0,0 plan_manager,"Goal Plan Manager",model_gamification_goal_plan,group_goal_manager,1,1,1,1 -plan_user_anybody,"Goal Plan Anybody",model_gamification_goal_plan,,1,0,0,0 +plan_user,"Goal Plan Anybody",model_gamification_goal_plan,base.group_user,1,0,0,0 planline_manager,"Goal Planline Manager",model_gamification_goal_planline,group_goal_manager,1,1,1,1 -planline_anybody,"Goal Planline Anybody",model_gamification_goal_planline,,1,0,0,0 +planline_user,"Goal Planline Anybody",model_gamification_goal_planline,base.group_user,1,0,0,0 badge_manager,"Badge Manager",model_gamification_badge,group_goal_manager,1,1,1,1 badge_user,"Badge Manager",model_gamification_badge,base.group_user,1,0,0,0 badge_anybody,"Badge Anybody",model_gamification_badge,,1,0,0,0