diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-02-12 14:54:30 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-02-12 14:54:30 +0000 |
| commit | d289619c757b52849002e0a78ecc4b45065cb8af (patch) | |
| tree | a7895d1f3106437a17d492adadc34c4fdd224b79 /app/models/member.rb | |
| parent | 10a462369b4c59891d60da69876c2d290feb7d58 (diff) | |
| download | redmine-d289619c757b52849002e0a78ecc4b45065cb8af.tar.gz redmine-d289619c757b52849002e0a78ecc4b45065cb8af.zip | |
Fixed potential error when sorting members without role (#10053).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8863 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/member.rb')
| -rw-r--r-- | app/models/member.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/app/models/member.rb b/app/models/member.rb index bddb54354..96e7c5c39 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -58,7 +58,17 @@ class Member < ActiveRecord::Base def <=>(member) a, b = roles.sort.first, member.roles.sort.first - a == b ? (principal <=> member.principal) : (a <=> b) + if a == b + if principal + principal <=> member.principal + else + 1 + end + elsif a + a <=> b + else + 1 + end end def deletable? |