| @@ -168,7 +168,7 class Version < ActiveRecord::Base | |||
|
|
168 | 168 | if self.effective_date |
|
|
169 | 169 | if version.effective_date |
|
|
170 | 170 | if self.effective_date == version.effective_date |
|
|
171 | "#{self.project.name} - #{self.name}" <=> "#{version.project.name} - #{version.name}" | |
|
|
171 | name == version.name ? id <=> version.id : name <=> version.name | |
|
|
172 | 172 | else |
|
|
173 | 173 | self.effective_date <=> version.effective_date |
|
|
174 | 174 | end |
| @@ -179,7 +179,7 class Version < ActiveRecord::Base | |||
|
|
179 | 179 | if version.effective_date |
|
|
180 | 180 | 1 |
|
|
181 | 181 | else |
|
|
182 | "#{self.project.name} - #{self.name}" <=> "#{version.project.name} - #{version.name}" | |
|
|
182 | name == version.name ? id <=> version.id : name <=> version.name | |
|
|
183 | 183 | end |
|
|
184 | 184 | end |
|
|
185 | 185 | end |
| @@ -115,6 +115,7 class VersionTest < ActiveSupport::TestCase | |||
|
|
115 | 115 | v1 = Version.create!(:project_id => 1, :name => 'v3', :effective_date => '2012-08-02') |
|
|
116 | 116 | v5 = Version.create!(:project_id => 1, :name => 'v5', :effective_date => '2012-07-02') |
|
|
117 | 117 | |
|
|
118 | assert_equal [v5, v3, v1, v2, v4], [v1, v2, v3, v4, v5].sort | |
|
|
118 | 119 | assert_equal [v5, v3, v1, v2, v4], Version.sorted.all |
|
|
119 | 120 | end |
|
|
120 | 121 | |
General Comments 0
You need to be logged in to leave comments.
Login now