summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-15 15:36:45 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-15 15:36:45 +0000
commit8a3126e1759e4e1b050633355c4d270a9710f37c (patch)
tree7b8570e65a8d7c698bad432e049d5955781a7927 /app
parent2f55caa1ba17e2fa3d5dd39b841ab98fad6ae5fd (diff)
downloadredmine-8a3126e1759e4e1b050633355c4d270a9710f37c.tar.gz
redmine-8a3126e1759e4e1b050633355c4d270a9710f37c.zip
Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9992 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/controllers/workflows_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb
index c95583fe9..fa70cdf39 100644
--- a/app/controllers/workflows_controller.rb
+++ b/app/controllers/workflows_controller.rb
@@ -52,7 +52,7 @@ class WorkflowsController < ApplicationController
@statuses ||= IssueStatus.sorted.all
if @tracker && @role && @statuses.any?
- workflows = WorkflowTransition.all(:conditions => {:role_id => @role.id, :tracker_id => @tracker.id})
+ workflows = WorkflowTransition.where(:role_id => @role.id, :tracker_id => @tracker.id).all
@workflows = {}
@workflows['always'] = workflows.select {|w| !w.author && !w.assignee}
@workflows['author'] = workflows.select {|w| w.author}
@@ -119,10 +119,10 @@ class WorkflowsController < ApplicationController
private
def find_roles
- @roles = Role.find(:all, :order => 'builtin, position')
+ @roles = Role.sorted.all
end
def find_trackers
- @trackers = Tracker.find(:all, :order => 'position')
+ @trackers = Tracker.sorted.all
end
end