##// END OF EJS Templates
jro_apps » redmine
RSS
Closed versions should be marked as completed (#21433)....
Jean-Philippe Lang -
r14637:5e5506587e95
parent child
Show More
Side by Side Unified
Context file:
r14637:5e5506587e95 Loading diff...:
Show file before | Show file after | Hide comments
@@ -40,7 +40,7 class VersionsController < ApplicationController
40 @versions += @project.rolled_up_versions.visible if @with_subprojects
40 @versions += @project.rolled_up_versions.visible if @with_subprojects
41 @versions = @versions.uniq.sort
41 @versions = @versions.uniq.sort
42 unless params[:completed]
42 unless params[:completed]
43 @completed_versions = @versions.select {|version| version.closed? || version.completed? }
43 @completed_versions = @versions.select(&:completed?)
44 @versions -= @completed_versions
44 @versions -= @completed_versions
45 end
45 end
46
46
Show file before | Show file after | Hide comments
@@ -102,9 +102,9 class Version < ActiveRecord::Base
102 status == 'open'
102 status == 'open'
103 end
103 end
104
104
105 # Returns true if the version is completed: due date reached and no open issues
105 # Returns true if the version is completed: closed or due date reached and no open issues
106 def completed?
106 def completed?
107 effective_date && (effective_date < Date.today) && (open_issues_count == 0)
107 closed? || (effective_date && (effective_date < Date.today) && (open_issues_count == 0))
108 end
108 end
109
109
110 def behind_schedule?
110 def behind_schedule?
Show file before | Show file after | Hide comments
@@ -138,6 +138,11 class VersionTest < ActiveSupport::TestCase
138 assert_equal false, version.completed?
138 assert_equal false, version.completed?
139 end
139 end
140
140
141 def test_completed_should_be_true_when_closed
142 version = Version.create!(:project_id => 1, :status => 'closed', :name => 'Closed')
143 assert_equal true, version.completed?
144 end
145
141 test "#behind_schedule? should be false if there are no issues assigned" do
146 test "#behind_schedule? should be false if there are no issues assigned" do
142 version = Version.generate!(:effective_date => Date.yesterday)
147 version = Version.generate!(:effective_date => Date.yesterday)
143 assert_equal false, version.behind_schedule?
148 assert_equal false, version.behind_schedule?
General Comments 0
You need to be logged in to leave comments. Login now