user.rb in enju_subject-0.1.0.pre26

- old
+ new
@@ -1,43 +1,8 @@
+# -*- encoding: utf-8 -*-
 class User < ActiveRecord::Base
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable
+  devise :database_authenticatable, #:registerable,
+    :recoverable, :rememberable, :trackable, #, :validatable
+    :lockable, :lock_strategy => :none, :unlock_strategy => :none
 
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me
-
-  has_one :user_has_role
-  has_one :role, :through => :user_has_role
-  belongs_to :user_group
-  belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id'
-  has_many :sent_messages, :foreign_key => 'sender_id', :class_name => 'Message'
-  has_many :received_messages, :foreign_key => 'receiver_id', :class_name => 'Message'
-
-  extend FriendlyId
-  friendly_id :username
-
-  def send_message(status, options = {})
-    MessageRequest.transaction do
-      request = MessageRequest.new
-      request.sender = User.find(1)
-      request.receiver = self
-      request.message_template = MessageTemplate.localized_template(status, self.locale)
-      request.save_message_body(options)
-      request.sm_send_message!
-    end
-  end
-
-  def has_role?(role_in_question)
-    return false unless role
-    return true if role.name == role_in_question
-    case role.name
-    when 'Administrator'
-      return true
-    when 'Librarian'
-      return true if role_in_question == 'User'
-    else
-      false
-    end
-  end
+  enju_leaf_user_model
 end