summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-13 13:57:11 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-13 13:57:11 +0200
commit13ecbb04bc4deeddec49ccad6e9c1538bbc405d4 (patch)
treef0bb9bf213ea0e9806c0bdd74a2c0b1db8ee32c5
parent0f134e54dd4b6044deb3042787602fde938436e5 (diff)
downloadgitlab-ce-13ecbb04bc4deeddec49ccad6e9c1538bbc405d4.tar.gz
Show only people who have assigned issues in assignee dropdown
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/controllers/projects/issues_controller.rb1
-rw-r--r--app/views/projects/issues/_issues.html.haml2
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index ba5c52d510f..3965569303f 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -29,6 +29,7 @@ class Projects::IssuesController < Projects::ApplicationController
sort_param = params[:sort] || 'newest'
@sort = sort_param.humanize unless sort_param.empty?
+ @assignees = User.where(id: @project.issues.pluck(:assignee_id))
respond_to do |format|
format.html
diff --git a/app/views/projects/issues/_issues.html.haml b/app/views/projects/issues/_issues.html.haml
index 87d30a4a163..fc4128a8299 100644
--- a/app/views/projects/issues/_issues.html.haml
+++ b/app/views/projects/issues/_issues.html.haml
@@ -49,7 +49,7 @@
Any
= link_to project_filter_path(assignee_id: 0) do
Unassigned
- - @project.team.members.sort_by(&:name).each do |user|
+ - @assignees.sort_by(&:name).each do |user|
%li
= link_to project_filter_path(assignee_id: user.id) do
= image_tag avatar_icon(user.email), class: "avatar s16", alt: ''