jro_apps/redmine Commit - r9532:aa18cd54c7ec

Code cleanup....

Jean-Philippe Lang -

r9532:aa18cd54c7ec

parent child

Context file:

r9532:aa18cd54c7ec

Collapse all files

app/models/role.rb +15 -7

                 ['own', :label_issues_visibility_own]
               ]
-              scope :sorted, {:order => 'builtin, position'}
+              scope :sorted, order("#{table_name}.builtin ASC, #{table_name}.position ASC")
-              scope :givable, { :conditions => "builtin = 0", :order => 'position' }
+              scope :givable, order("#{table_name}.position ASC").where(:builtin => 0)
               scope :builtin, lambda { |*args|
-                compare = 'not' if args.first == true
+                compare = (args.first == true ? 'not' : '')
-                { :conditions => "#{compare} builtin = 0" }
+                where("#{compare} builtin = 0")
               }
               before_destroy :check_deletable
               end
               def <=>(role)
-                role ? position <=> role.position : -1
+                if role
+                  if builtin == role.builtin
+                    position <=> role.position
+                  else
+                    builtin <=> role.builtin
+                  end
+                else
+                  -1
+                end
               end
               def to_s
               # Find all the roles that can be given to a project member
               def self.find_all_givable
-                find(:all, :conditions => {:builtin => 0}, :order => 'position')
+                Role.givable.all
               end
               # Return the builtin 'non member' role.  If the role doesn't exist,
               end
               def self.find_or_create_system_role(builtin, name)
-                role = first(:conditions => {:builtin => builtin})
+                role = where(:builtin => builtin).first
                 if role.nil?
                   role = create(:name => name, :position => 0) do |r|
                     r.builtin = builtin

app/models/workflow.rb +2 -2

               # Returns workflow transitions count by tracker and role
               def self.count_by_tracker_and_role
                 counts = connection.select_all("SELECT role_id, tracker_id, count(id) AS c FROM #{Workflow.table_name} GROUP BY role_id, tracker_id")
-                roles = Role.find(:all, :order => 'builtin, position')
+                roles = Role.sorted.all
-                trackers = Tracker.find(:all, :order => 'position')
+                trackers = Tracker.sorted.all
                 result = []
                 trackers.each do |tracker|

test/unit/role_test.rb +17 0

@@ -20,6 +20,19 require File.expand_path('../../test_helper', __FILE__)
20	class RoleTest < ActiveSupport::TestCase	20	class RoleTest < ActiveSupport::TestCase
21	fixtures :roles, :workflows	21	fixtures :roles, :workflows
22		22
		23	def test_sorted_scope
		24	assert_equal Role.all.sort, Role.sorted.all
		25	end
		26
		27	def test_givable_scope
		28	assert_equal Role.all.reject(&:builtin?).sort, Role.givable.all
		29	end
		30
		31	def test_builtin_scope
		32	assert_equal Role.all.select(&:builtin?).sort, Role.builtin(true).all.sort
		33	assert_equal Role.all.reject(&:builtin?).sort, Role.builtin(false).all.sort
		34	end
		35
23	def test_copy_workflows	36	def test_copy_workflows
24	source = Role.find(1)	37	source = Role.find(1)
25	assert_equal 90, source.workflows.size	38	assert_equal 90, source.workflows.size
@@ -57,6 +70,10 class RoleTest < ActiveSupport::TestCase
57	assert_equal 'Non membre', Role.non_member.name	70	assert_equal 'Non membre', Role.non_member.name
58	end	71	end
59		72
		73	def test_find_all_givable
		74	assert_equal Role.all.reject(&:builtin?).sort, Role.find_all_givable
		75	end
		76
60	context "#anonymous" do	77	context "#anonymous" do
61	should "return the anonymous role" do	78	should "return the anonymous role" do
62	role = Role.anonymous	79	role = Role.anonymous

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages