summaryrefslogtreecommitdiff
path: root/app/controllers/concerns/membership_actions.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-09-09 18:51:31 +0200
committerRémy Coutable <remy@rymai.me>2016-10-03 16:57:48 +0200
commitc8b1311934935c7ac7fd901558e19ac496fbad2c (patch)
tree53760b417a85f51b76ee21a343834b20bc45ede3 /app/controllers/concerns/membership_actions.rb
parent3158f57dba6dcef3e586ae8fced7deb6fdbd6dc0 (diff)
downloadgitlab-ce-c8b1311934935c7ac7fd901558e19ac496fbad2c.tar.gz
Fix a few things after the initial improvment to Members::DestroyService
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/controllers/concerns/membership_actions.rb')
-rw-r--r--app/controllers/concerns/membership_actions.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/controllers/concerns/membership_actions.rb b/app/controllers/concerns/membership_actions.rb
index e40c8cab4a9..c13333641d3 100644
--- a/app/controllers/concerns/membership_actions.rb
+++ b/app/controllers/concerns/membership_actions.rb
@@ -15,16 +15,17 @@ module MembershipActions
end
def leave
- Members::DestroyService.new(membershipable, current_user, user_id: current_user.id).execute(:all)
+ member = Members::DestroyService.new(membershipable, current_user, user_id: current_user.id).
+ execute(:all)
source_type = membershipable.class.to_s.humanize(capitalize: false)
notice =
- if @member.request?
+ if member.request?
"Your access request to the #{source_type} has been withdrawn."
else
"You left the \"#{membershipable.human_name}\" #{source_type}."
end
- redirect_path = @member.request? ? @member.source : [:dashboard, membershipable.class.to_s.tableize]
+ redirect_path = member.request? ? member.source : [:dashboard, membershipable.class.to_s.tableize]
redirect_to redirect_path, notice: notice
end