diff --git a/app/controllers/users/invitations_controller.rb b/app/controllers/users/invitations_controller.rb index 259dd2ce3..44042ac48 100644 --- a/app/controllers/users/invitations_controller.rb +++ b/app/controllers/users/invitations_controller.rb @@ -122,10 +122,10 @@ module Users Activities::CreateActivityService .call(activity_type: :invite_user_to_team, owner: current_user, - subject: current_team, - team: current_team, + subject: @team, + team: @team, message_items: { - team: current_team.id, + team: @team.id, user_invited: user.id, role: user_team.role_str }) diff --git a/app/helpers/global_activities_helper.rb b/app/helpers/global_activities_helper.rb index decc6a13c..46762a846 100644 --- a/app/helpers/global_activities_helper.rb +++ b/app/helpers/global_activities_helper.rb @@ -42,7 +42,7 @@ module GlobalActivitiesHelper # Not link for now return current_value when Team - path = projects_path + path = projects_path(team: obj.id) when Repository path = repository_path(obj) when RepositoryRow