From eda2c0c607e4f12803d9021f9f2eacf56a4d2fcd Mon Sep 17 00:00:00 2001
From: Marin Jankovski <marin@gitlab.com>
Date: Tue, 25 Mar 2014 12:40:49 +0100
Subject: [PATCH] Include commits.
---
app/controllers/projects_controller.rb | 25 +++++++++++++++++--
.../layouts/_init_auto_complete.html.haml | 2 +-
2 files changed, 24 insertions(+), 3 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
diff --git a/app/views/layouts/_init_auto_complete.html.haml b/app/views/layouts/_init_auto_complete.html.haml
index 9e728b462bb..353f7ce34f1 100644
--- a/app/views/layouts/_init_auto_complete.html.haml
+++ b/app/views/layouts/_init_auto_complete.html.haml
@@ -1,3 +1,3 @@
:javascript
- GitLab.GfmAutoComplete.dataSource = "#{autocomplete_sources_project_path(@project)}"
+ GitLab.GfmAutoComplete.dataSource = "#{autocomplete_sources_project_path(@project, type: @noteable.class, type_id: params[:id])}"
GitLab.GfmAutoComplete.setup();
--
GitLab