summaryrefslogtreecommitdiffstats
path: root/app/controllers/timelog_controller.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-02-12 21:43:54 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-02-12 21:43:54 +0000
commit4dc7f662e3d93f93d8164c1450a9c4a49bc15503 (patch)
tree9a8b792f302b1401bd71c0ea20ea1da93565da71 /app/controllers/timelog_controller.rb
parenta2626bbccf876fa290d0ee2b3c84168e6eb728da (diff)
downloadredmine-4dc7f662e3d93f93d8164c1450a9c4a49bc15503.tar.gz
redmine-4dc7f662e3d93f93d8164c1450a9c4a49bc15503.zip
Added issue subject to the time entries view and subject + tracker to the csv export (#616). Default order on date column set to desc.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1142 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/timelog_controller.rb')
-rw-r--r--app/controllers/timelog_controller.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 39e6d2fd3..926fe0c6f 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -151,6 +151,8 @@ private
l(:field_user),
l(:field_activity),
l(:field_issue),
+ l(:field_tracker),
+ l(:field_subject),
l(:field_hours),
l(:field_comments)
]
@@ -158,9 +160,11 @@ private
# csv lines
@entries.each do |entry|
fields = [l_date(entry.spent_on),
- entry.user.name,
- entry.activity.name,
+ entry.user,
+ entry.activity,
(entry.issue ? entry.issue.id : nil),
+ (entry.issue ? entry.issue.tracker : nil),
+ (entry.issue ? entry.issue.subject : nil),
entry.hours,
entry.comments
]