##// END OF EJS Templates
'Assigned to' drop down list is now sorted by user's lastname....
Jean-Philippe Lang -
r926:81ada666bb54
parent child
Show More
@@ -132,7 +132,7 class Project < ActiveRecord::Base
132
132
133 # Users issues can be assigned to
133 # Users issues can be assigned to
134 def assignable_users
134 def assignable_users
135 members.select {|m| m.role.assignable?}.collect {|m| m.user}
135 members.select {|m| m.role.assignable?}.collect {|m| m.user}.sort
136 end
136 end
137
137
138 # Returns the mail adresses of users that should be always notified on project events
138 # Returns the mail adresses of users that should be always notified on project events
@@ -147,7 +147,7 class Query < ActiveRecord::Base
147 user_values = []
147 user_values = []
148 user_values << ["<< #{l(:label_me)} >>", "me"] if executed_by
148 user_values << ["<< #{l(:label_me)} >>", "me"] if executed_by
149 if project
149 if project
150 user_values += project.users.collect{|s| [s.name, s.id.to_s] }
150 user_values += project.users.sort.collect{|s| [s.name, s.id.to_s] }
151 elsif executed_by
151 elsif executed_by
152 # members of the user's projects
152 # members of the user's projects
153 user_values += executed_by.projects.collect(&:users).flatten.uniq.sort.collect{|s| [s.name, s.id.to_s] }
153 user_values += executed_by.projects.collect(&:users).flatten.uniq.sort.collect{|s| [s.name, s.id.to_s] }
@@ -163,7 +163,7 class User < ActiveRecord::Base
163 end
163 end
164
164
165 def <=>(user)
165 def <=>(user)
166 lastname == user.lastname ? firstname <=> user.firstname : lastname <=> user.lastname
166 user.nil? ? -1 : (lastname == user.lastname ? firstname <=> user.firstname : lastname <=> user.lastname)
167 end
167 end
168
168
169 def to_s
169 def to_s
General Comments 0
You need to be logged in to leave comments. Login now