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

Improve the logic in AccessRequestsFinder#execute & #execute! 

Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
Rémy Coutable 2016-09-27 14:35:42 +02:00
parent 924a6b7d33
commit 5f88aafbf6
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/finders/access_requests_finder.rb
View File

@ -7,23 +7,21 @@ class AccessRequestsFinder
@source = source
end
def execute(current_user, raise_error: false)
if cannot_see_access_requests?(current_user)
raise Gitlab::Access::AccessDeniedError if raise_error
def execute(*args)
execute!(*args)
rescue Gitlab::Access::AccessDeniedError
[]
end
return []
end
def execute!(current_user)
raise Gitlab::Access::AccessDeniedError unless can_see_access_requests?(current_user)
source.requesters
end
def execute!(current_user)
execute(current_user, raise_error: true)
end
private
def cannot_see_access_requests?(current_user)
!source || !current_user || !current_user.can?(:"admin_#{source.class.to_s.underscore}", source)
def can_see_access_requests?(current_user)
source && current_user && current_user.can?(:"admin_#{source.class.to_s.underscore}", source)
end
end