'Assigned to' drop down list is now sorted by user's lastname.

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

'Assigned to' drop down list is now sorted by user's lastname.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@939 e93f8b46-1217-0410-a6f0-8f06a7374b81
81ada666 · Jean-Philippe Lang · db002eda · 81ada666 · 81ada666 · 81ada666
Commit 81ada666 authored Dec 01, 2007 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

project.rb app/models/project.rb +1 -1

query.rb app/models/query.rb +1 -1

user.rb app/models/user.rb +1 -1

No files found.
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -132,7 +132,7 @@ class Project < ActiveRecord::Base
  
  # Users issues can be assigned to
  def assignable_users
-    members.select {|m| m.role.assignable?}.collect {|m| m.user}
+    members.select {|m| m.role.assignable?}.collect {|m| m.user}.sort
  end
  
  # Returns the mail adresses of users that should be always notified on project events

--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -147,7 +147,7 @@ class Query < ActiveRecord::Base
    user_values = []
    user_values << ["<< #{l(:label_me)} >>", "me"] if executed_by
    if project
-      user_values += project.users.collect{|s| [s.name, s.id.to_s] }
+      user_values += project.users.sort.collect{|s| [s.name, s.id.to_s] }
    elsif executed_by
      # members of the user's projects
      user_values += executed_by.projects.collect(&:users).flatten.uniq.sort.collect{|s| [s.name, s.id.to_s] }

--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -163,7 +163,7 @@ class User < ActiveRecord::Base
  end

  def <=>(user)
-    lastname == user.lastname ? firstname <=> user.firstname : lastname <=> user.lastname
+    user.nil? ? -1 : (lastname == user.lastname ? firstname <=> user.firstname : lastname <=> user.lastname)
  end
  
  def to_s