diff app/models/member.rb @ 931:ec1c49528f36 cannam_integration

Merge from branch "redmine-1.3"

--- a/app/models/member.rb	Wed Jun 27 14:56:14 2012 +0100
+++ b/app/models/member.rb	Wed Jun 27 15:04:58 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?