|
|
@@ -23,7 +23,7 @@ class UsersController < ApplicationController |
|
|
end
|
|
|
end
|
|
|
|
|
|
|
|
|
def watch_users
|
|
|
def watch_users
|
|
|
watchers = Watcher.watching_users(@user.id).includes(:user).order("watchers.created_at asc")
|
|
|
|
|
|
|
|
|
watchers = Watcher.watching_users(@user.id).includes(:user).order("watchers.created_at desc")
|
|
|
if params[:search].present?
|
|
|
if params[:search].present?
|
|
|
search_user_ids = User.where(id: watchers.pluck(:watchable_id)).like(params[:search]).pluck(:id)
|
|
|
search_user_ids = User.where(id: watchers.pluck(:watchable_id)).like(params[:search]).pluck(:id)
|
|
|
watchers = watchers.where(watchable_id: search_user_ids)
|
|
|
watchers = watchers.where(watchable_id: search_user_ids)
|
|
|
@@ -33,7 +33,7 @@ class UsersController < ApplicationController |
|
|
end
|
|
|
end
|
|
|
|
|
|
|
|
|
def fan_users
|
|
|
def fan_users
|
|
|
watchers = @user.watchers.includes(:user).order("watchers.created_at asc")
|
|
|
|
|
|
|
|
|
watchers = @user.watchers.includes(:user).order("watchers.created_at desc")
|
|
|
watchers = watchers.joins(:user).where("LOWER(concat(users.lastname, users.firstname, users.login)) LIKE ?", "%#{params[:search].split(" ").join('|')}%") if params[:search].present?
|
|
|
watchers = watchers.joins(:user).where("LOWER(concat(users.lastname, users.firstname, users.login)) LIKE ?", "%#{params[:search].split(" ").join('|')}%") if params[:search].present?
|
|
|
|
|
|
|
|
|
@watchers_count = watchers.size
|
|
|
@watchers_count = watchers.size
|
|
|
|