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 1d83342b52b05dbf162b0ee6f5379c51b0c26e8e..727bde68f2a3a91c27b08b8ffb78dd377931513e 100644 (file)
--- 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?