diff options
author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-07-14 14:16:20 +0300 |
---|---|---|
committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-07-14 18:31:45 +0300 |
commit | 574b3efd6bfe7df64ec704844f2619c547731aa6 (patch) | |
tree | 4561b1d84dff79e8561fe42c9afa198f46db4c83 /app | |
parent | 60b91b46f289b1e4ac72827cf01370b2604622ac (diff) |
Fixes the user order being overriden in the autocomplete controller
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/autocomplete_controller.rb | 4 | ||||
-rw-r--r-- | app/models/user.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb index fe331a883c1..3120916c5bb 100644 --- a/app/controllers/autocomplete_controller.rb +++ b/app/controllers/autocomplete_controller.rb @@ -5,10 +5,10 @@ class AutocompleteController < ApplicationController def users @users ||= User.none - @users = @users.search(params[:search]) if params[:search].present? - @users = @users.where.not(id: params[:skip_users]) if params[:skip_users].present? @users = @users.active @users = @users.reorder(:name) + @users = @users.search(params[:search]) if params[:search].present? + @users = @users.where.not(id: params[:skip_users]) if params[:skip_users].present? @users = @users.page(params[:page]).per(params[:per_page]) if params[:todo_filter].present? && current_user diff --git a/app/models/user.rb b/app/models/user.rb index dd1a391773a..8f40af24e20 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -314,7 +314,7 @@ class User < ActiveRecord::Base table[:name].matches(pattern) .or(table[:email].matches(pattern)) .or(table[:username].matches(pattern)) - ).reorder(order % { query: ActiveRecord::Base.connection.quote(query) }, id: :desc) + ).reorder(order % { query: ActiveRecord::Base.connection.quote(query) }, :name) end # searches user by given pattern |