kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Inverse condition in Members::ApproveAccessRequestService

Browse source 
Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
Rémy Coutable 2016-09-22 15:50:24 +02:00
parent 5dcdf1d51b
commit 94996963c5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/services/members/approve_access_request_service.rb
View file

@ -14,7 +14,7 @@ module Members
condition = params[:user_id] ? { user_id: params[:user_id] } : { id: params[:id] } condition = params[:user_id] ? { user_id: params[:user_id] } : { id: params[:id] }
access_requester = source.requesters.find_by!(condition) access_requester = source.requesters.find_by!(condition)
raise Gitlab::Access::AccessDeniedError if cannot_update_access_requester?(access_requester) raise Gitlab::Access::AccessDeniedError unless can_update_access_requester?(access_requester)
access_requester.access_level = params[:access_level] if params[:access_level] access_requester.access_level = params[:access_level] if params[:access_level]
access_requester.accept_request access_requester.accept_request
@ -24,8 +24,8 @@ module Members
private private
def cannot_update_access_requester?(access_requester) def can_update_access_requester?(access_requester)
!access_requester || !can?(current_user, action_member_permission(:update, access_requester), access_requester) access_requester && can?(current_user, action_member_permission(:update, access_requester), access_requester)
end end
end end
end end