diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index a1f910243f9c78338ede1ca38f692a3845f5ab16..92443441c528ff85dc3390610ba2995e40ccb973 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -49,7 +49,7 @@ class IssuesController < ApplicationController @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement) @issue_pages = Paginator.new self, @issue_count, limit, params['page'] @issues = Issue.find :all, :order => sort_clause, - :include => [ :assigned_to, :status, :tracker, :project, :priority, :category ], + :include => [ :assigned_to, :status, :tracker, :project, :priority, :category, :fixed_version ], :conditions => @query.statement, :limit => limit, :offset => @issue_pages.current.offset diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index c779c9d1612a5d84e10be48d65728507e7d2a62d..f9a88f6ddd09f861ae372863b42f288137139612 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -116,6 +116,8 @@ module IssuesHelper l(:field_priority), l(:field_subject), l(:field_assigned_to), + l(:field_category), + l(:field_fixed_version), l(:field_author), l(:field_start_date), l(:field_due_date), @@ -136,7 +138,9 @@ module IssuesHelper issue.tracker.name, issue.priority.name, issue.subject, - (issue.assigned_to ? issue.assigned_to.name : ""), + issue.assigned_to, + issue.category, + issue.fixed_version, issue.author.name, issue.start_date ? l_date(issue.start_date) : nil, issue.due_date ? l_date(issue.due_date) : nil, diff --git a/app/models/query.rb b/app/models/query.rb index 8b15e294b25032bc0cab567924a844b76c0b9f53..30df55b96d13a4bdec00038dbc8ce1edd1ff5dfe 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -100,6 +100,7 @@ class Query < ActiveRecord::Base QueryColumn.new(:assigned_to, :sortable => "#{User.table_name}.lastname"), QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on"), QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name"), + QueryColumn.new(:fixed_version), QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"), QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"), QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),