kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makes Version#<=> consistent with SQL sort. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10152 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-08-02 16:47:53 +00:00
parent 34cdac1669
commit 2275f46138
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/version.rb
View File

@ -168,7 +168,7 @@ class Version < ActiveRecord::Base
if self.effective_date
if version.effective_date
if self.effective_date == version.effective_date
"#{self.project.name} - #{self.name}" <=> "#{version.project.name} - #{version.name}"
name == version.name ? id <=> version.id : name <=> version.name
else
self.effective_date <=> version.effective_date
end
@ -179,7 +179,7 @@ class Version < ActiveRecord::Base
if version.effective_date
1
else
"#{self.project.name} - #{self.name}" <=> "#{version.project.name} - #{version.name}"
name == version.name ? id <=> version.id : name <=> version.name
end
end
end

1
test/unit/version_test.rb
View File

@ -115,6 +115,7 @@ class VersionTest < ActiveSupport::TestCase
v1 = Version.create!(:project_id => 1, :name => 'v3', :effective_date => '2012-08-02')
v5 = Version.create!(:project_id => 1, :name => 'v5', :effective_date => '2012-07-02')
assert_equal [v5, v3, v1, v2, v4], [v1, v2, v3, v4, v5].sort
assert_equal [v5, v3, v1, v2, v4], Version.sorted.all
end