meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-04-04 15:01:38 +00:00
Code Issues Releases Wiki Activity

Closed versions should be marked as completed (#21433).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@15019 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-01-09 09:10:24 +00:00
parent f5702c35df
commit 5e5506587e
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/versions_controller.rb
View File

@ -40,7 +40,7 @@ class VersionsController < ApplicationController
@versions += @project.rolled_up_versions.visible if @with_subprojects @versions += @project.rolled_up_versions.visible if @with_subprojects
@versions = @versions.uniq.sort @versions = @versions.uniq.sort
unless params[:completed] unless params[:completed]
@completed_versions = @versions.select {|version| version.closed? || version.completed? } @completed_versions = @versions.select(&:completed?)
@versions -= @completed_versions @versions -= @completed_versions
end end

4
app/models/version.rb
View File

@ -102,9 +102,9 @@ class Version < ActiveRecord::Base
status == 'open' status == 'open'
end end
# Returns true if the version is completed: due date reached and no open issues # Returns true if the version is completed: closed or due date reached and no open issues
def completed? def completed?
effective_date && (effective_date < Date.today) && (open_issues_count == 0) closed? || (effective_date && (effective_date < Date.today) && (open_issues_count == 0))
end end
def behind_schedule? def behind_schedule?

5
test/unit/version_test.rb
View File

@ -138,6 +138,11 @@ class VersionTest < ActiveSupport::TestCase
assert_equal false, version.completed? assert_equal false, version.completed?
end end
def test_completed_should_be_true_when_closed
version = Version.create!(:project_id => 1, :status => 'closed', :name => 'Closed')
assert_equal true, version.completed?
end
test "#behind_schedule? should be false if there are no issues assigned" do test "#behind_schedule? should be false if there are no issues assigned" do
version = Version.generate!(:effective_date => Date.yesterday) version = Version.generate!(:effective_date => Date.yesterday)
assert_equal false, version.behind_schedule? assert_equal false, version.behind_schedule?