making full_name method public

This commit is contained in:
Mike McCabe
2013-10-11 15:59:53 -04:00
parent 5177e60669
commit dbd0c2548d
+3 -3
View File
@@ -17,7 +17,7 @@ class User < ActiveRecord::Base
has_one :paid_time_off, :foreign_key => :user_id, :primary_key => :user_id, :dependent => :destroy
has_one :work_info, :foreign_key => :user_id, :primary_key => :user_id, :dependent => :destroy
has_many :performance, :foreign_key => :user_id, :primary_key => :user_id, :dependent => :destroy
has_many :message, :foreign_key => :receiver_id, :dependent => :destroy
def build_benefits_data
@@ -26,13 +26,13 @@ class User < ActiveRecord::Base
build_work_info(POPULATE_WORK_INFO.shuffle.first)
performance.build(POPULATE_PERFORMANCE.shuffle.first)
end
private
def full_name
"#{self.first_name} #{self.last_name}"
end
private
def self.authenticate(email, password)
auth = nil
user = find_by_email(email)