Redirect to the member's source on request withdrawal
Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
parent
6c5b2377f7
commit
724f986fb2
|
@ -34,8 +34,9 @@ module MembershipActions
|
|||
else
|
||||
"You left the \"#{@member.source.human_name}\" #{source_type}."
|
||||
end
|
||||
redirect_path = @member.request? ? @member.source : [:dashboard, @member.real_source_type.tableize]
|
||||
|
||||
redirect_to [:dashboard, @member.real_source_type.tableize], notice: notice
|
||||
redirect_to redirect_path, notice: notice
|
||||
else
|
||||
if cannot_leave?
|
||||
alert = "You can not leave the \"#{@member.source.human_name}\" #{source_type}."
|
||||
|
|
|
@ -134,7 +134,7 @@ describe Groups::GroupMembersController do
|
|||
delete :leave, group_id: group
|
||||
|
||||
expect(response).to set_flash.to 'Your access request to the group has been withdrawn.'
|
||||
expect(response).to redirect_to(dashboard_groups_path)
|
||||
expect(response).to redirect_to(group_path(group))
|
||||
expect(group.members.request).to be_empty
|
||||
expect(group.users).not_to include user
|
||||
end
|
||||
|
|
|
@ -190,7 +190,7 @@ describe Projects::ProjectMembersController do
|
|||
project_id: project
|
||||
|
||||
expect(response).to set_flash.to 'Your access request to the project has been withdrawn.'
|
||||
expect(response).to redirect_to(dashboard_projects_path)
|
||||
expect(response).to redirect_to(namespace_project_path(project.namespace, project))
|
||||
expect(project.members.request).to be_empty
|
||||
expect(project.users).not_to include user
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue