Commit 5a90d044 authored by Robert Speicher's avatar Robert Speicher

Allow filtering by issues with no assigned... assignee

Continues #1222
parent b1ea0b3c
...@@ -144,14 +144,19 @@ class IssuesController < ApplicationController ...@@ -144,14 +144,19 @@ class IssuesController < ApplicationController
else @project.issues.opened else @project.issues.opened
end end
@issues = @issues.where(assignee_id: params[:assignee_id]) if params[:assignee_id].present?
@issues = @issues.tagged_with(params[:label_name]) if params[:label_name].present? @issues = @issues.tagged_with(params[:label_name]) if params[:label_name].present?
@issues = @issues.includes(:author, :project).order("updated_at") @issues = @issues.includes(:author, :project).order("updated_at")
# Filter by specific assignee_id (or lack thereof)?
if params[:assignee_id].present?
@issues = @issues.where(assignee_id: (params[:assignee_id] == '0' ? nil : params[:assignee_id]))
end
# Filter by specific milestone_id (or lack thereof)? # Filter by specific milestone_id (or lack thereof)?
if params[:milestone_id].present? if params[:milestone_id].present?
@issues = @issues.where(milestone_id: (params[:milestone_id] == '0' ? nil : params[:milestone_id])) @issues = @issues.where(milestone_id: (params[:milestone_id] == '0' ? nil : params[:milestone_id]))
end end
@issues @issues
end end
......
...@@ -42,4 +42,8 @@ module IssuesHelper ...@@ -42,4 +42,8 @@ module IssuesHelper
def unassigned_milestone def unassigned_milestone
OpenStruct.new(id: 0, title: 'Unspecified') OpenStruct.new(id: 0, title: 'Unspecified')
end end
def unassigned_issue
OpenStruct.new(id: 0, name: 'Unassigned')
end
end end
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
.right .right
= form_tag project_issues_path(@project), method: :get, class: :right do = form_tag project_issues_path(@project), method: :get, class: :right do
= select_tag(:label_name, options_for_select(issue_tags, params[:label_name]), prompt: "Labels") = select_tag(:label_name, options_for_select(issue_tags, params[:label_name]), prompt: "Labels")
= select_tag(:assignee_id, options_from_collection_for_select(@project.users.all, "id", "name", params[:assignee_id]), prompt: "Assignee") = select_tag(:assignee_id, options_from_collection_for_select([unassigned_issue] + @project.users.all, "id", "name", params[:assignee_id]), prompt: "Assignee")
= select_tag(:milestone_id, options_from_collection_for_select([unassigned_milestone] + @project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), prompt: "Milestone") = select_tag(:milestone_id, options_from_collection_for_select([unassigned_milestone] + @project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), prompt: "Milestone")
= hidden_field_tag :f, params[:f] = hidden_field_tag :f, params[:f]
.clearfix .clearfix
......
...@@ -102,6 +102,7 @@ describe "Issues" do ...@@ -102,6 +102,7 @@ describe "Issues" do
@issue = Issue.first @issue = Issue.first
@issue.milestone = Factory(:milestone, project: project) @issue.milestone = Factory(:milestone, project: project)
@issue.assignee = nil
@issue.save @issue.save
end end
...@@ -120,5 +121,21 @@ describe "Issues" do ...@@ -120,5 +121,21 @@ describe "Issues" do
page.should_not have_content 'barbaz' page.should_not have_content 'barbaz'
page.should_not have_content 'gitlab' page.should_not have_content 'gitlab'
end end
it "should allow filtering by issues with no specified assignee" do
visit project_issues_path(project, assignee_id: '0')
page.should have_content 'foobar'
page.should_not have_content 'barbaz'
page.should_not have_content 'gitlab'
end
it "should allow filtering by a specified assignee" do
visit project_issues_path(project, assignee_id: @user.id)
page.should_not have_content 'foobar'
page.should have_content 'barbaz'
page.should have_content 'gitlab'
end
end end
end 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