diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-12-01 17:15:42 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-12-01 17:15:42 +0000 |
| commit | db002edabdec9050e6d512ae8759783894b9624a (patch) | |
| tree | a7f455c3b01a3c59380808b44ffb8b0d767acf82 /app/controllers/timelog_controller.rb | |
| parent | 3baf086e2d8e5d969ce12217e1e143e5b4ec971a (diff) | |
| download | redmine-db002edabdec9050e6d512ae8759783894b9624a.tar.gz redmine-db002edabdec9050e6d512ae8759783894b9624a.zip | |
* Added links to previous and next revisions on revision view (patch by Cyril Mougel slightly edited)
* Fixed TimelogController#report december error
* Fixed ProjectsControllerTest#test_activity 1st and 2nd day of the month failure
git-svn-id: http://redmine.rubyforge.org/svn/trunk@938 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/timelog_controller.rb')
| -rw-r--r-- | app/controllers/timelog_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb index 1a1bace3a..f90c4527e 100644 --- a/app/controllers/timelog_controller.rb +++ b/app/controllers/timelog_controller.rb @@ -54,7 +54,7 @@ class TimelogController < ApplicationController begin; @date_to = params[:date_to].to_date; rescue; end end @date_from ||= Date.civil(Date.today.year, 1, 1) - @date_to ||= Date.civil(Date.today.year, Date.today.month+1, 1) - 1 + @date_to ||= (Date.civil(Date.today.year, Date.today.month, 1) >> 1) - 1 unless @criterias.empty? sql_select = @criterias.collect{|criteria| @available_criterias[criteria][:sql] + " AS " + criteria}.join(', ') |