summaryrefslogtreecommitdiffstats
path: root/app/controllers/timelog_controller.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-04-01 22:42:10 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-04-01 22:42:10 +0000
commit467f74510e44d2c0821fad691a71bc0292b8944c (patch)
tree932448c1faa2e6a6a7d9f73048b61561605b9c9f /app/controllers/timelog_controller.rb
parent043cb37b161d712e1c6fe7b9aa41d7af356cf795 (diff)
downloadredmine-467f74510e44d2c0821fad691a71bc0292b8944c.tar.gz
redmine-467f74510e44d2c0821fad691a71bc0292b8944c.zip
Time report can be done at issue level (closes #970) + timelog views xhtml validation.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1319 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/timelog_controller.rb')
-rw-r--r--app/controllers/timelog_controller.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 7e2b55872..e617d3805 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -45,7 +45,10 @@ class TimelogController < ApplicationController
:label => :label_tracker},
'activity' => {:sql => "#{TimeEntry.table_name}.activity_id",
:klass => Enumeration,
- :label => :label_activity}
+ :label => :label_activity},
+ 'issue' => {:sql => "#{TimeEntry.table_name}.issue_id",
+ :klass => Issue,
+ :label => :label_issue}
}
@criterias = params[:criterias] || []
@@ -196,7 +199,7 @@ private
render_404
end
- # Retreive the date range based on predefined ranges or specific from/to param dates
+ # Retrieves the date range based on predefined ranges or specific from/to param dates
def retrieve_date_range
@free_period = false
@from, @to = nil, nil