diff options
| -rw-r--r-- | app/helpers/milestones_helper.rb | 7 | ||||
| -rw-r--r-- | app/models/milestone.rb | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb index a4257b03395..7de81d8dfdb 100644 --- a/app/helpers/milestones_helper.rb +++ b/app/helpers/milestones_helper.rb @@ -38,11 +38,10 @@ module MilestonesHelper end def milestone_remaining_days(milestone) - days = milestone.remaining_days - - if days == 0 + if milestone.expired? content_tag(:strong, 'expired') - elsif days.to_i > 0 + elsif milestone.due_date + days = milestone.remaining_days content = content_tag(:strong, days) content << " #{'day'.pluralize(days)} remaining" end diff --git a/app/models/milestone.rb b/app/models/milestone.rb index 3df9a979161..7dc2f909b2f 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -111,8 +111,7 @@ class Milestone < ActiveRecord::Base end def remaining_days - return nil if due_date.nil? - return 0 if due_date < Date.today + return 0 if !due_date || expired? (due_date - Date.today).to_i end |