| @@ -45,14 +45,13 class VersionsController < ApplicationController | |||||
| 45 | end |
|
45 | end | |
| 46 |
|
46 | |||
| 47 | @issues_by_version = {} |
|
47 | @issues_by_version = {} | |
| 48 |
|
|
48 | if @selected_tracker_ids.any? && @versions.any? | |
| 49 | @versions.each do |version| |
|
49 | issues = Issue.visible.all( | |
| 50 | issues = version.fixed_issues.visible.find(:all, |
|
50 | :include => [:project, :status, :tracker, :priority, :fixed_version], | |
| 51 | :include => [:project, :status, :tracker, :priority], |
|
51 | :conditions => {:tracker_id => @selected_tracker_ids, :project_id => project_ids, :fixed_version_id => @versions.map(&:id)}, | |
| 52 | :conditions => {:tracker_id => @selected_tracker_ids, :project_id => project_ids}, |
|
52 | :order => "#{Project.table_name}.lft, #{Tracker.table_name}.position, #{Issue.table_name}.id" | |
| 53 | :order => "#{Project.table_name}.lft, #{Tracker.table_name}.position, #{Issue.table_name}.id") |
|
53 | ) | |
| 54 |
|
|
54 | @issues_by_version = issues.group_by(&:fixed_version) | |
| 55 | end |
|
|||
| 56 | end |
|
55 | end | |
| 57 | @versions.reject! {|version| !project_ids.include?(version.project_id) && @issues_by_version[version].blank?} |
|
56 | @versions.reject! {|version| !project_ids.include?(version.project_id) && @issues_by_version[version].blank?} | |
| 58 | } |
|
57 | } | |
General Comments 0
You need to be logged in to leave comments.
Login now