diff options
author | Marin Jankovski <marin@gitlab.com> | 2014-03-25 12:40:49 +0100 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2014-03-25 18:53:09 +0100 |
commit | eda2c0c607e4f12803d9021f9f2eacf56a4d2fcd (patch) | |
tree | faa806ae62602df89976477e241caa8b528687a0 /app/controllers/projects_controller.rb | |
parent | 02850210b6694983bed0c3eb7ad8dedfc7d95c54 (diff) | |
download | gitlab-ce-eda2c0c607e4f12803d9021f9f2eacf56a4d2fcd.tar.gz |
Include commits.
Diffstat (limited to 'app/controllers/projects_controller.rb')
-rw-r--r-- | app/controllers/projects_controller.rb | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index aac9fcd555c..353d4f0c4b6 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -123,12 +123,21 @@ class ProjectsController < ApplicationController end def autocomplete_sources - participating_users = @project.team.members.sort_by(&:username).map { |user| { username: user.username, name: user.name } } + User.participating(@project.notes).select([:username, :name]).sort_by(&:username).map { |user| { username: user.username, name: user.name } } + note_type = params['type'] + note_id = params['type_id'] + participating = if note_type && note_id + participants_in(note_type, note_id) + else + [] + end + team_members = @project.team.members.sort_by(&:username).map { |user| { username: user.username, name: user.name } } + participants = team_members + participating + #participating = @project.issues.map { |issue| issue.participants.sort_by(&:username).map { |user| { username: user.username, name: user.name } } }.flatten @suggestions = { emojis: Emoji.names.map { |e| { name: e, path: view_context.image_url("emoji/#{e}.png") } }, issues: @project.issues.select([:iid, :title, :description]), mergerequests: @project.merge_requests.select([:iid, :title, :description]), - members: participating_users.uniq + members: participants.uniq } respond_to do |format| @@ -163,4 +172,16 @@ class ProjectsController < ApplicationController def user_layout current_user ? "projects" : "public_projects" end + + def participants_in(type, id) + note = case type + when "Issue", "MergeRequest" + type.constantize.find_by_iid(id) + when "Commits" + type.constantize.find(id) + else + [] + end + note.participants.sort_by(&:username).map { |user| { username: user.username, name: user.name } } + end end |