Redmine 3.3 fixes

imported from takaosan@9285948
cmrd-senya · Sep 25, 2018 · e1865ba · e1865ba
1 parent 1e766b1
commit e1865ba
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/controllers/boards_watchers_controller.rb b/app/controllers/boards_watchers_controller.rb
@@ -62,7 +62,7 @@ def issues_watchers_bulk
 
     if request.post?
       watcher_users=(params['watcher_user_ids'] || []).collect do |w|
-        u=User.find_by_id(w.to_i)
+        u=User.find_by(id: w.to_i)
         (u && u.active? ? u : nil)
       end
       watcher_users.compact!
@@ -92,17 +92,17 @@ def issues_watchers_bulk
 
   def setup_environment
     @project=Project.find(params[:project_id])
-    @board=Board.find_by_id(params[:board_id]) if params[:board_id]
+    @board=Board.find_by(id: params[:board_id]) if params[:board_id]
     render_404 unless @board
-    @topic=@board.topics.find_by_id(params[:topic_id]) if params[:topic_id]
+    @topic=@board.topics.find_by(id: params[:topic_id]) if params[:topic_id]
   rescue ActiveRecord::RecordNotFound
     render_404
   end
 
   def setup_environment_issues
     @project=nil
     unless params[:issues].blank?
-      @issues=Issue.find_all_by_id(params[:issues])
+      @issues=Issue.where(id: params[:issues])
       @project=@issues[0].project if @issues.size > 0
     else
       @issues=nil

diff --git a/lib/boards_watchers_hooks.rb b/lib/boards_watchers_hooks.rb
@@ -77,7 +77,7 @@ def bw_context_menu_link(name, url, options={})
     end
 
     if url.is_a?(Hash) && Rails::VERSION::MAJOR >= 3 && Redmine::Utils::relative_url_root != ''
-      url="#{Redmine::Utils::relative_url_root}#{url_for(url.merge(:only_path => true))}"
+      url="#{url_for(url.merge(:only_path => true))}"
     end
     link_to h(name), url, options
   end