diff options
| author | Go MAEDA <maeda@farend.jp> | 2018-04-09 13:00:41 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2018-04-09 13:00:41 +0000 |
| commit | 8b0bfbbc8b05c12e29199feb99ff6042a3461b67 (patch) | |
| tree | 22bd16d594a9f143d95cad93224b87cb20742591 /lib | |
| parent | 784b9f4aca932e922d356dd858b91795e93f80c2 (diff) | |
| download | redmine-8b0bfbbc8b05c12e29199feb99ff6042a3461b67.tar.gz redmine-8b0bfbbc8b05c12e29199feb99ff6042a3461b67.zip | |
Gantt bars with start date and end date on the same day don't become red by overdue (#13521).
Patch by Mizuki ISHIKAWA.
git-svn-id: http://svn.redmine.org/redmine/trunk@17294 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redmine/helpers/gantt.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb index c0b1f3148..294303209 100644 --- a/lib/redmine/helpers/gantt.rb +++ b/lib/redmine/helpers/gantt.rb @@ -595,11 +595,11 @@ module Redmine coords[:bar_progress_end] = self.date_to - self.date_from + 1 end end - if progress_date < User.current.today - late_date = [User.current.today, end_date].min + if progress_date <= User.current.today + late_date = [User.current.today, end_date].min + 1 if late_date > self.date_from && late_date > start_date if late_date < self.date_to - coords[:bar_late_end] = late_date - self.date_from + 1 + coords[:bar_late_end] = late_date - self.date_from else coords[:bar_late_end] = self.date_to - self.date_from + 1 end |