scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-10 08:21:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

Change current_team to target team, add id param to link

Browse source
This commit is contained in:
Urban Rotnik 2020-04-23 12:40:43 +02:00
parent 9ed4a442d8
commit 38c198705c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/users/invitations_controller.rb
View file

@ -122,10 +122,10 @@ module Users
Activities::CreateActivityService Activities::CreateActivityService
.call(activity_type: :invite_user_to_team, .call(activity_type: :invite_user_to_team,
owner: current_user, owner: current_user,
subject: current_team, subject: @team,
team: current_team, team: @team,
message_items: { message_items: {
team: current_team.id, team: @team.id,
user_invited: user.id, user_invited: user.id,
role: user_team.role_str role: user_team.role_str
}) })

2
app/helpers/global_activities_helper.rb
View file

@ -42,7 +42,7 @@ module GlobalActivitiesHelper
# Not link for now # Not link for now
return current_value return current_value
when Team when Team
path = projects_path path = projects_path(team: obj.id)
when Repository when Repository
path = repository_path(obj) path = repository_path(obj)
when RepositoryRow when RepositoryRow