summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2009-04-05 12:09:59 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2009-04-05 12:09:59 +0000
commite28b5e1f08adced5a7429743b376841c57672ccd (patch)
treefa308adfc29c8548d9a829562c0cc91f3bd4aa8a
parentaa38f755c649fc0bb3706476bb582d83876529b6 (diff)
downloadredmine-e28b5e1f08adced5a7429743b376841c57672ccd.tar.gz
redmine-e28b5e1f08adced5a7429743b376841c57672ccd.zip
Merged r2643 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2653 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/helpers/timelog_helper.rb6
-rw-r--r--doc/CHANGELOG1
2 files changed, 6 insertions, 1 deletions
diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb
index f068b4db8..88a4cd85e 100644
--- a/app/helpers/timelog_helper.rb
+++ b/app/helpers/timelog_helper.rb
@@ -35,7 +35,11 @@ module TimelogHelper
end
def select_hours(data, criteria, value)
- data.select {|row| row[criteria] == value}
+ if value.to_s.empty?
+ data.select {|row| row[criteria].blank? }
+ else
+ data.select {|row| row[criteria] == value}
+ end
end
def sum_hours(data)
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 5ffacce0c..16e1bab88 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -20,6 +20,7 @@ http://www.redmine.org/
* Fixed: News summary field content is not searchable
* Fixed: Journal#save has a wrong signature
* Fixed: Email footer signature convention
+* Fixed: Timelog report do not show time for non-versioned issues
== 2009-03-07 v0.8.2