Mercurial > hg > soundsoftware-site
diff app/models/member.rb @ 929:5f33065ddc4b redmine-1.3
Update to Redmine SVN rev 9414 on 1.3-stable branch
author | Chris Cannam |
---|---|
date | Wed, 27 Jun 2012 14:54:18 +0100 |
parents | cbb26bc654de |
children | 433d4f72a19b |
line wrap: on
line diff
--- a/app/models/member.rb Fri Feb 24 19:09:32 2012 +0000 +++ b/app/models/member.rb Wed Jun 27 14:54:18 2012 +0100 @@ -50,7 +50,17 @@ 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?