summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2009-02-03 17:32:07 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2009-02-03 17:32:07 +0000
commitb11a1d852c3791f20d0e623f3b00465baa838a20 (patch)
tree15e26de1977b818c5ee436d6183e74188c97cff8
parentc9ca635fa7f8df6b8a4ab3d4e0c9ed36dbf91f21 (diff)
downloadredmine-b11a1d852c3791f20d0e623f3b00465baa838a20.tar.gz
redmine-b11a1d852c3791f20d0e623f3b00465baa838a20.zip
Closed issue are not overdue, fixes r2140 (#2337).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2361 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/models/issue.rb2
-rw-r--r--test/unit/issue_test.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb
index cbd262800..618c5597d 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -215,7 +215,7 @@ class Issue < ActiveRecord::Base
# Returns true if the issue is overdue
def overdue?
- !due_date.nil? && (due_date < Date.today)
+ !due_date.nil? && (due_date < Date.today) && !status.is_closed?
end
# Users the issue can be assigned to
diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb
index b82303264..89ec3c6da 100644
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -226,5 +226,6 @@ class IssueTest < Test::Unit::TestCase
assert !Issue.new(:due_date => Date.today).overdue?
assert !Issue.new(:due_date => 1.day.from_now.to_date).overdue?
assert !Issue.new(:due_date => nil).overdue?
+ assert !Issue.new(:due_date => 1.day.ago.to_date, :status => IssueStatus.find(:first, :conditions => {:is_closed => true})).overdue?
end
end