diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-23 19:44:09 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-29 13:57:04 +0300 |
| commit | 7ff6af19cc2d0f300a184de3887e4e5163bc9a00 (patch) | |
| tree | 0a27ae9bf8b185ae657c7624aec31ad94f23453f /app/finders | |
| parent | f4238634d3a2661ef5998d3c0df6a6fb90174013 (diff) | |
Dropdown bug fixes
Added back upcoming to milestone filter
Fixed bug that would cause the currently selected value to disappear on filters
Fixed bug that throw an error when filtering by upcoming when there is only a milestone in the past
Diffstat (limited to 'app/finders')
| -rw-r--r-- | app/finders/issuable_finder.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb index 046286dd9e1..a7799b91eb8 100644 --- a/app/finders/issuable_finder.rb +++ b/app/finders/issuable_finder.rb @@ -243,7 +243,7 @@ class IssuableFinder end def filter_by_upcoming_milestone? - params[:milestone_title] == '#upcoming' + params[:milestone_title] == 'Upcoming' end def by_milestone(items) @@ -252,7 +252,7 @@ class IssuableFinder items = items.where(milestone_id: [-1, nil]) elsif filter_by_upcoming_milestone? upcoming = Milestone.where(project_id: projects).upcoming - items = items.joins(:milestone).where(milestones: { title: upcoming.title }) + items = items.joins(:milestone).where(milestones: { title: upcoming.try(:title) }) else items = items.joins(:milestone).where(milestones: { title: params[:milestone_title] }) |