From f905ab48bb3a330e7a7e1fcf49d1d93f692845a0 Mon Sep 17 00:00:00 2001 From: rlisowski Date: Tue, 15 Apr 2014 17:43:12 +0200 Subject: [PATCH] watchers fix --- app/controllers/watchers_controller.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb index e6c4d31..3a71626 100644 --- a/app/controllers/watchers_controller.rb +++ b/app/controllers/watchers_controller.rb @@ -40,7 +40,8 @@ class WatchersController < ApplicationController else user_ids << params[:user_id] end - user_ids.flatten.compact.uniq.each do |user_id| + user_ids = user_ids.flatten.compact.uniq.map(&:to_i) & users_for_new_watcher.map(&:id) + user_ids.each do |user_id| Watcher.create(:watchable => @watched, :user_id => user_id) end respond_to do |format| @@ -116,10 +117,12 @@ class WatchersController < ApplicationController def users_for_new_watcher users = [] - if params[:q].blank? && @project.present? - users = @project.users.sorted - else - users = User.active.sorted.like(params[:q]).limit(100) + if @project.present? + if params[:q].blank? + users = @project.users.sorted + else + users = @project.users.sorted.like(params[:q]).limit(10) + end end if @watched users -= @watched.watcher_users -- 1.8.3.2