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

Don't count any confidential issues for non-project-members

This commit is contained in:
Sean McGivern 2017-06-23 12:50:33 +01:00
parent 20bb678d91
commit c400030d0f
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/finders/issuable_finder.rb
View File

@ -62,7 +62,7 @@ class IssuableFinder
# grouping and counting within that query.
#
def count_by_state
count_params = params.merge(state: nil, sort: nil)
count_params = params.merge(state: nil, sort: nil, for_counting: true)
labels_count = label_names.any? ? label_names.count : 1
finder = self.class.new(current_user, count_params)
counts = Hash.new(0)

13
app/finders/issues_finder.rb
View File

@ -23,8 +23,8 @@ class IssuesFinder < IssuableFinder
end
def not_restricted_by_confidentiality
return Issue.where('issues.confidential IS NOT TRUE') if user_cannot_see_confidential_issues?
return Issue.all if user_can_see_all_confidential_issues?
return Issue.where('issues.confidential IS NOT TRUE') if user_cannot_see_confidential_issues?
Issue.where('
issues.confidential IS NOT TRUE
@ -37,16 +37,19 @@ class IssuesFinder < IssuableFinder
end
def user_can_see_all_confidential_issues?
return false unless current_user
return true if current_user.full_private_access?
return @user_can_see_all_confidential_issues = false if current_user.blank?
return @user_can_see_all_confidential_issues = true if current_user.full_private_access?
project? &&
@user_can_see_all_confidential_issues =
project? &&
project &&
project.team.max_member_access(current_user.id) >= CONFIDENTIAL_ACCESS_LEVEL
end
def user_cannot_see_confidential_issues?
current_user.blank?
return false if user_can_see_all_confidential_issues?
current_user.blank? || params[:for_counting]
end
private