Make the versions with the same date sorted by name (#864).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1296 e93f8b46-1217-0410-a6f0-8f06a7374b81

Make the versions with the same date sorted by name (#864).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1296 e93f8b46-1217-0410-a6f0-8f06a7374b81
ecc742f3 · Jean-Philippe Lang · 7a434c90 · ecc742f3
Commit ecc742f3 authored Mar 26, 2008 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

version.rb app/models/version.rb +2 -2

No files found.
--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -89,11 +89,11 @@ class Version < ActiveRecord::Base
  
  def to_s; name end
  
-  # Versions are sorted by effective_date 
+  # Versions are sorted by effective_date and name
  # Those with no effective_date are at the end, sorted by name
  def <=>(version)
    if self.effective_date
-      version.effective_date ? (self.effective_date <=> version.effective_date) : -1
+      version.effective_date ? (self.effective_date == version.effective_date ? self.name <=> version.name : self.effective_date <=> version.effective_date) : -1
    else
      version.effective_date ? 1 : (self.name <=> version.name)
    end