Commit 1c0b58a7 authored by Douwe Maan's avatar Douwe Maan

Remove duplication from InvitesController.

parent 1b5c483d
...@@ -12,21 +12,9 @@ class InvitesController < ApplicationController ...@@ -12,21 +12,9 @@ class InvitesController < ApplicationController
def accept def accept
if member.accept_invite!(current_user) if member.accept_invite!(current_user)
case member.source label, path = source_info(member.source)
when Project
project = member.source redirect_to path, notice: "You have been granted #{member.human_access} access to #{label}."
source = "project #{project.name_with_namespace}"
path = namespace_project_path(project.namespace, project)
when Group
group = member.source
source = "group #{group.name}"
path = group_path(group)
else
source = "who knows what"
path = dashboard_path
end
redirect_to path, notice: "You have been granted #{member.human_access} access to #{source}."
else else
redirect_to :back, alert: "The invitation could not be accepted." redirect_to :back, alert: "The invitation could not be accepted."
end end
...@@ -34,16 +22,7 @@ class InvitesController < ApplicationController ...@@ -34,16 +22,7 @@ class InvitesController < ApplicationController
def decline def decline
if member.decline_invite! if member.decline_invite!
case member.source label, _ = source_info(member.source)
when Project
project = member.source
source = "project #{project.name_with_namespace}"
when Group
group = member.source
source = "group #{group.name}"
else
source = "who knows what"
end
path = path =
if current_user if current_user
...@@ -81,4 +60,22 @@ class InvitesController < ApplicationController ...@@ -81,4 +60,22 @@ class InvitesController < ApplicationController
store_location_for :user, request.fullpath store_location_for :user, request.fullpath
redirect_to new_user_session_path, notice: notice redirect_to new_user_session_path, notice: notice
end end
def source_info(source)
case source
when Project
project = member.source
label = "project #{project.name_with_namespace}"
path = namespace_project_path(project.namespace, project)
when Group
group = member.source
label = "group #{group.name}"
path = group_path(group)
else
label = "who knows what"
path = dashboard_path
end
[label, path]
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment