Refactor: Extract methods to before_filters
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3536 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
3a99f18913
commit
be20d98040
|
@ -19,6 +19,8 @@ class WorkflowsController < ApplicationController
|
||||||
layout 'admin'
|
layout 'admin'
|
||||||
|
|
||||||
before_filter :require_admin
|
before_filter :require_admin
|
||||||
|
before_filter :find_roles
|
||||||
|
before_filter :find_trackers
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@workflow_counts = Workflow.count_by_tracker_and_role
|
@workflow_counts = Workflow.count_by_tracker_and_role
|
||||||
|
@ -40,8 +42,6 @@ class WorkflowsController < ApplicationController
|
||||||
redirect_to :action => 'edit', :role_id => @role, :tracker_id => @tracker
|
redirect_to :action => 'edit', :role_id => @role, :tracker_id => @tracker
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@roles = Role.find(:all, :order => 'builtin, position')
|
|
||||||
@trackers = Tracker.find(:all, :order => 'position')
|
|
||||||
|
|
||||||
@used_statuses_only = (params[:used_statuses_only] == '0' ? false : true)
|
@used_statuses_only = (params[:used_statuses_only] == '0' ? false : true)
|
||||||
if @tracker && @used_statuses_only && @tracker.issue_statuses.any?
|
if @tracker && @used_statuses_only && @tracker.issue_statuses.any?
|
||||||
|
@ -51,8 +51,6 @@ class WorkflowsController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def copy
|
def copy
|
||||||
@trackers = Tracker.find(:all, :order => 'position')
|
|
||||||
@roles = Role.find(:all, :order => 'builtin, position')
|
|
||||||
|
|
||||||
if params[:source_tracker_id].blank? || params[:source_tracker_id] == 'any'
|
if params[:source_tracker_id].blank? || params[:source_tracker_id] == 'any'
|
||||||
@source_tracker = nil
|
@source_tracker = nil
|
||||||
|
@ -80,4 +78,14 @@ class WorkflowsController < ApplicationController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def find_roles
|
||||||
|
@roles = Role.find(:all, :order => 'builtin, position')
|
||||||
|
end
|
||||||
|
|
||||||
|
def find_trackers
|
||||||
|
@trackers = Tracker.find(:all, :order => 'position')
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue