From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 15 Jul 2012 15:36:45 +0000 (+0000)
Subject: Code cleanup.
X-Git-Tag: 2.1.0~324
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8a3126e1759e4e1b050633355c4d270a9710f37c;p=redmine.git

Code cleanup.

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

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