From a7b8e6c02a473134e3ba8097133d3f05aa76decb Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Fri, 10 Jan 2014 12:49:52 +0000 Subject: [PATCH] Rails4: replace deprecated find_all_by_* at WatchersController git-svn-id: http://svn.redmine.org/redmine/trunk@12616 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/watchers_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb index 2f55de2f0..325e9e9f2 100644 --- a/app/controllers/watchers_controller.rb +++ b/app/controllers/watchers_controller.rb @@ -52,7 +52,7 @@ class WatchersController < ApplicationController def append if params[:watcher].is_a?(Hash) user_ids = params[:watcher][:user_ids] || [params[:watcher][:user_id]] - @users = User.active.find_all_by_id(user_ids) + @users = User.active.where(:id => user_ids).all end end @@ -91,7 +91,7 @@ class WatchersController < ApplicationController def find_watchables klass = Object.const_get(params[:object_type].camelcase) rescue nil if klass && klass.respond_to?('watched_by') - @watchables = klass.find_all_by_id(Array.wrap(params[:object_id])) + @watchables = klass.where(:id => Array.wrap(params[:object_id])).all raise Unauthorized if @watchables.any? {|w| w.respond_to?(:visible?) && !w.visible?} end render_404 unless @watchables.present?