| @@ -356,13 +356,9 class ProjectsController < ApplicationController | |||||
| 356 | @issues_by_version = {} |
|
356 | @issues_by_version = {} | |
| 357 | unless @selected_tracker_ids.empty? |
|
357 | unless @selected_tracker_ids.empty? | |
| 358 | @versions.each do |version| |
|
358 | @versions.each do |version| | |
| 359 | conditions = {:tracker_id => @selected_tracker_ids} |
|
|||
| 360 | if !@project.versions.include?(version) |
|
|||
| 361 | conditions.merge!(:project_id => project_ids) |
|
|||
| 362 | end |
|
|||
| 363 | issues = version.fixed_issues.visible.find(:all, |
|
359 | issues = version.fixed_issues.visible.find(:all, | |
| 364 | :include => [:project, :status, :tracker, :priority], |
|
360 | :include => [:project, :status, :tracker, :priority], | |
| 365 |
:conditions => |
|
361 | :conditions => {:tracker_id => @selected_tracker_ids, :project_id => project_ids}, | |
| 366 | :order => "#{Project.table_name}.lft, #{Tracker.table_name}.position, #{Issue.table_name}.id") |
|
362 | :order => "#{Project.table_name}.lft, #{Tracker.table_name}.position, #{Issue.table_name}.id") | |
| 367 | @issues_by_version[version] = issues |
|
363 | @issues_by_version[version] = issues | |
| 368 | end |
|
364 | end | |
General Comments 0
You need to be logged in to leave comments.
Login now