From 70f5291808469a808eb2bee70e9e97acc7716bb6 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Thu, 6 Aug 2015 00:20:41 -0700 Subject: Always add current user to autocomplete controller to support filter by "Me" Partial fix #2202 --- app/controllers/autocomplete_controller.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/controllers/autocomplete_controller.rb') diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb index 52e9c58b47c..5c3ca8e23c9 100644 --- a/app/controllers/autocomplete_controller.rb +++ b/app/controllers/autocomplete_controller.rb @@ -33,6 +33,8 @@ class AutocompleteController < ApplicationController @users = @users.search(params[:search]) if params[:search].present? @users = @users.active @users = @users.page(params[:page]).per(PER_PAGE) + # Always include current user if available to filter by "Me" + @users = User.find(@users.pluck(:id) + [current_user.id]).uniq if current_user render json: @users, only: [:name, :username, :id], methods: [:avatar_url] end -- cgit v1.2.1