kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent "Overwriting existing method User.active" warning, scope is already defined on the base class (#11545). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10160 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-08-07 16:14:24 +00:00
parent 2e35a6800f
commit 962134ab4f
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.rb
View File

@ -52,8 +52,6 @@ class User < Principal
has_one :api_token, :class_name => 'Token', :conditions => "action='api'"
belongs_to :auth_source
# Active non-anonymous users scope
scope :active, :conditions => "#{User.table_name}.status = #{STATUS_ACTIVE}"
scope :logged, :conditions => "#{User.table_name}.status <> #{STATUS_ANONYMOUS}"
scope :status, lambda {|arg| arg.blank? ? {} : {:conditions => {:status => arg.to_i}} }