Redmine

• ./plugins/redmine_project_types_relations/lib/project_types_relations/overrides/project_type_query_patch.rb
• ./plugins/redmine_project_types_relations/lib/project_types_relations/overrides/project_query_patch.rb
• ./plugins/redmine_project_types/lib/project_types/overrides/project_query_patch.rb
• ./plugins/redmine_project_types/lib/project_types/overrides/query_patch.rb
• ./plugins/redmine_project_types/lib/project_types/extensions/project_query_patch.rb
• ./plugins/redmine_colored_enumeration/lib/colored_enumeration/extensions/query_custom_field_column_patch.rb

diff --git a/app/models/query.rb b/app/models/query.rb
index fcd2c9e95..980976e5f 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -618,7 +618,7 @@ class Query < ActiveRecord::Base
     author_values = []
     author_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
     author_values +=
-      users.sort_by(&:status).
+      users.sort_by{|p| [p.status, p]}.
         collect{|s| [s.name, s.id.to_s, l("status_#{User::LABEL_BY_STATUS[s.status]}")]}
     author_values << [l(:label_user_anonymous), User.anonymous.id.to_s]
     author_values
@@ -628,7 +628,7 @@ class Query < ActiveRecord::Base
     assigned_to_values = []
     assigned_to_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
     assigned_to_values +=
-      (Setting.issue_group_assignment? ? principals : users).sort_by(&:status).
+      (Setting.issue_group_assignment? ? principals : users).sort_by{|p| [p.status, p]}.
         collect{|s| [s.name, s.id.to_s, l("status_#{User::LABEL_BY_STATUS[s.status]}")]}
     assigned_to_values
   end
@@ -658,7 +658,7 @@ class Query < ActiveRecord::Base
     watcher_values = [["<< #{l(:label_me)} >>", "me"]]
     if User.current.allowed_to?(:view_issue_watchers, self.project, global: true)
       watcher_values +=
-        principals.sort_by(&:status).
+        principals.sort_by{|p| [p.status, p]}.
           collect{|s| [s.name, s.id.to_s, l("status_#{User::LABEL_BY_STATUS[s.status]}")]}
     end
     watcher_values