diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-08-07 16:14:24 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-08-07 16:14:24 +0000 |
| commit | 962134ab4f861de0a86ed86dcf01a5cffab0940c (patch) | |
| tree | 4e066ca138ceacf5dba0310494dd0ec4ca44635c /app/models/user.rb | |
| parent | 2e35a6800f71e9e8d0ccfc24a5cb6f5a2775b9f8 (diff) | |
| download | redmine-962134ab4f861de0a86ed86dcf01a5cffab0940c.tar.gz redmine-962134ab4f861de0a86ed86dcf01a5cffab0940c.zip | |
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
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 5aac1d1fe..9350fb95c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -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}} } |