Commit d2630221 authored by Marin Jankovski's avatar Marin Jankovski
Browse files

Correct identation, default value if note doesn't exist.

parent 12c3962f
......@@ -126,10 +126,10 @@ def autocomplete_sources
note_type = params['type']
note_id = params['type_id']
participating = if note_type && note_id
participants_in(note_type, note_id)
else
[]
end
participants_in(note_type, note_id)
else
[]
end
team_members = sorted(@project.team.members)
participants = team_members + participating
@suggestions = {
......@@ -174,16 +174,18 @@ def user_layout
def participants_in(type, id)
users = case type
when "Issue"
@project.issues.find_by_iid(id).participants
when "MergeRequest"
@project.merge_requests.find_by_iid(id).participants
when "Commit"
author_ids = Note.for_commit_id(id).pluck(:author_id).uniq
User.where(id: author_ids)
else
[]
end
when "Issue"
issue = @project.issues.find_by_iid(id)
issue ? issue.participants : []
when "MergeRequest"
merge_request = @project.merge_requests.find_by_iid(id)
merge_request ? merge_request.participants : []
when "Commit"
author_ids = Note.for_commit_id(id).pluck(:author_id).uniq
User.where(id: author_ids)
else
[]
end
sorted(users)
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