From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 15 Jul 2012 15:39:36 +0000 (+0000)
Subject: Find role and tracker only when param is present.
X-Git-Tag: 2.1.0~322
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=712e5be29f9afccfa353d315fc6b664bdcdf8057;p=redmine.git

Find role and tracker only when param is present.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9994 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb
index 1d83342b5..727bde68f 100644
--- a/app/controllers/workflows_controller.rb
+++ b/app/controllers/workflows_controller.rb
@@ -25,8 +25,8 @@ class WorkflowsController < ApplicationController
   end
 
   def edit
-    @role = Role.find_by_id(params[:role_id])
-    @tracker = Tracker.find_by_id(params[:tracker_id])
+    @role = Role.find_by_id(params[:role_id]) if params[:role_id]
+    @tracker = Tracker.find_by_id(params[:tracker_id]) if params[:tracker_id]
 
     if request.post?
       WorkflowTransition.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
@@ -59,8 +59,8 @@ class WorkflowsController < ApplicationController
   end
 
   def permissions
-    @role = Role.find_by_id(params[:role_id])
-    @tracker = Tracker.find_by_id(params[:tracker_id])
+    @role = Role.find_by_id(params[:role_id]) if params[:role_id]
+    @tracker = Tracker.find_by_id(params[:tracker_id]) if params[:tracker_id]
 
     if @role && @tracker
       if request.post?