##// END OF EJS Templates
jro_apps » redmine
RSS
Simplifies Principal.active scope (status defaults to 1 for groups)....
Jean-Philippe Lang -
r8626:0154d7477b53
parent child
Show More
Side by Side Unified
Context file:
r8626:0154d7477b53 Loading diff...:
Show file before | Show file after | Hide comments
@@ -24,7 +24,7 class Principal < ActiveRecord::Base
24 has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
24 has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
25
25
26 # Groups and active users
26 # Groups and active users
27 named_scope :active, :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status = 1)"
27 named_scope :active, :conditions => "#{Principal.table_name}.status = 1"
28
28
29 named_scope :like, lambda {|q|
29 named_scope :like, lambda {|q|
30 s = "%#{q.to_s.strip.downcase}%"
30 s = "%#{q.to_s.strip.downcase}%"
Show file before | Show file after | Hide comments
@@ -19,6 +19,14 require File.expand_path('../../test_helper', __FILE__)
19
19
20 class PrincipalTest < ActiveSupport::TestCase
20 class PrincipalTest < ActiveSupport::TestCase
21
21
22 def test_active_scope_should_return_groups_and_active_users
23 result = Principal.active.all
24 assert_include Group.first, result
25 assert_not_nil result.detect {|p| p.is_a?(User)}
26 assert_nil result.detect {|p| p.is_a?(User) && !p.active?}
27 assert_nil result.detect {|p| p.is_a?(AnonymousUser)}
28 end
29
22 context "#like" do
30 context "#like" do
23 setup do
31 setup do
24 Principal.generate!(:login => 'login')
32 Principal.generate!(:login => 'login')
General Comments 0
You need to be logged in to leave comments. Login now