Moved user status constants to Principal model.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10958 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/principal.rb b/app/models/principal.rb
index f467f847f5e315d1cbdd78fb6b4303850fdcac35..72cae3719cada3ede88fffba5f52aae8b55314a5 100644 (file)
--- a/app/models/principal.rb
+++ b/app/models/principal.rb
@@ -18,6 +18,12 @@
 class Principal < ActiveRecord::Base
   self.table_name = "#{table_name_prefix}users#{table_name_suffix}"
 
+  # Account statuses
+  STATUS_ANONYMOUS  = 0
+  STATUS_ACTIVE     = 1
+  STATUS_REGISTERED = 2
+  STATUS_LOCKED     = 3
+
   has_many :members, :foreign_key => 'user_id', :dependent => :destroy
   has_many :memberships, :class_name => 'Member', :foreign_key => 'user_id', :include => [ :project, :roles ], :conditions => "#{Project.table_name}.status<>#{Project::STATUS_ARCHIVED}", :order => "#{Project.table_name}.name"
   has_many :projects, :through => :memberships

diff --git a/app/models/user.rb b/app/models/user.rb
index eed359feabf7476e0e8b94f1c38e752dd1a4479f..0c7fd7558d30f11c741da170bac80802370fc502 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -20,12 +20,6 @@ require "digest/sha1"
 class User < Principal
   include Redmine::SafeAttributes
 
-  # Account statuses
-  STATUS_ANONYMOUS  = 0
-  STATUS_ACTIVE     = 1
-  STATUS_REGISTERED = 2
-  STATUS_LOCKED     = 3
-
   # Different ways of displaying/sorting users
   USER_FORMATS = {
     :firstname_lastname => {