Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-07-04 15:39:09 +02:00
Code Issues Packages Projects Releases Activity

Merged r14380 (#20066).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14385 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-06-28 10:00:53 +00:00
parent cf85562599 3834b3d2ef
commit 952d69c00a
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/group.rb
View File

@@ -32,7 +32,7 @@ class Group < Principal
before_destroy :remove_references_before_destroy
scope :sorted, lambda { order(:type => :asc, :lastname => :desc) }
scope :sorted, lambda { order(:type => :asc, :lastname => :asc) }
scope :named, lambda {|arg| where("LOWER(#{table_name}.lastname) = LOWER(?)", arg.to_s.strip)}
scope :givable, lambda {where(:type => 'Group')}

8
test/unit/group_test.rb
View File

@@ -158,4 +158,12 @@ class GroupTest < ActiveSupport::TestCase
end
assert_equal 0, group.reload.users.count
end
def test_sorted_scope_should_sort_groups_alphabetically
Group.delete_all
b = Group.generate!(:name => 'B')
a = Group.generate!(:name => 'A')
assert_equal %w(A B), Group.sorted.to_a.map(&:name)
end
end