dinislage/redmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code cleanup.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10994 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2012-12-13 13:43:01 +00:00
parent d46a0a3a4f
commit c93fccc84a
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/principal.rb
+2 -2
View File
@@ -30,7 +30,7 @@ class Principal < ActiveRecord::Base
has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
# Groups and active users
scope :active, lambda { where("#{Principal.table_name}.status = 1") }
scope :active, lambda { where(:status => STATUS_ACTIVE) }
scope :like, lambda {|q|
q = q.to_s
@@ -57,7 +57,7 @@ class Principal < ActiveRecord::Base
where("1=0")
else
ids = projects.map(&:id)
where("#{Principal.table_name}.status = 1 AND #{Principal.table_name}.id IN (SELECT DISTINCT user_id FROM #{Member.table_name} WHERE project_id IN (?))", ids)
active.where("#{Principal.table_name}.id IN (SELECT DISTINCT user_id FROM #{Member.table_name} WHERE project_id IN (?))", ids)
end
}
# Principals that are not members of projects