summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2007-11-18 15:53:58 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2007-11-18 15:53:58 +0000
commitf8aa2dc9b71640a4da008e8ef0968a8cd9ce7385 (patch)
treeaa931b16c44968aea3ede178db49c830f31c44a8 /app
parentbb2de53d93adb517fbfcfb37e33adc959b2848b3 (diff)
downloadredmine-f8aa2dc9b71640a4da008e8ef0968a8cd9ce7385.tar.gz
redmine-f8aa2dc9b71640a4da008e8ef0968a8cd9ce7385.zip
'fixed version' field can now be displayed on the issue list.
Category and fixed version fields added to the CSV export. git-svn-id: http://redmine.rubyforge.org/svn/trunk@914 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/controllers/issues_controller.rb2
-rw-r--r--app/helpers/issues_helper.rb6
-rw-r--r--app/models/query.rb1
3 files changed, 7 insertions, 2 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index a1f910243..92443441c 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 c779c9d16..f9a88f6dd 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 8b15e294b..30df55b96 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"),