kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rails4: replace deprecated find_all_by_* at WatchersController 

git-svn-id: http://svn.redmine.org/redmine/trunk@12616 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2014-01-10 12:49:52 +00:00
parent a3f0dae9c4
commit a7b8e6c02a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/watchers_controller.rb
View File

@ -52,7 +52,7 @@ class WatchersController < ApplicationController
def append def append
if params[:watcher].is_a?(Hash) if params[:watcher].is_a?(Hash)
user_ids = params[:watcher][:user_ids] || [params[:watcher][:user_id]] 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
end end
@ -91,7 +91,7 @@ class WatchersController < ApplicationController
def find_watchables def find_watchables
klass = Object.const_get(params[:object_type].camelcase) rescue nil klass = Object.const_get(params[:object_type].camelcase) rescue nil
if klass && klass.respond_to?('watched_by') 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?} raise Unauthorized if @watchables.any? {|w| w.respond_to?(:visible?) && !w.visible?}
end end
render_404 unless @watchables.present? render_404 unless @watchables.present?