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
This commit is contained in:
parent
5097f51784
commit
712e5be29f
|
@ -25,8 +25,8 @@ class WorkflowsController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def edit
|
def edit
|
||||||
@role = Role.find_by_id(params[:role_id])
|
@role = Role.find_by_id(params[:role_id]) if params[:role_id]
|
||||||
@tracker = Tracker.find_by_id(params[:tracker_id])
|
@tracker = Tracker.find_by_id(params[:tracker_id]) if params[:tracker_id]
|
||||||
|
|
||||||
if request.post?
|
if request.post?
|
||||||
WorkflowTransition.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
|
WorkflowTransition.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
|
||||||
|
@ -59,8 +59,8 @@ class WorkflowsController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def permissions
|
def permissions
|
||||||
@role = Role.find_by_id(params[:role_id])
|
@role = Role.find_by_id(params[:role_id]) if params[:role_id]
|
||||||
@tracker = Tracker.find_by_id(params[:tracker_id])
|
@tracker = Tracker.find_by_id(params[:tracker_id]) if params[:tracker_id]
|
||||||
|
|
||||||
if @role && @tracker
|
if @role && @tracker
|
||||||
if request.post?
|
if request.post?
|
||||||
|
|
Loading…
Reference in New Issue