From dbd0c2548db35181a68aef47ab399288964d6757 Mon Sep 17 00:00:00 2001 From: Mike McCabe Date: Fri, 11 Oct 2013 15:59:53 -0400 Subject: [PATCH] making full_name method public --- app/models/user.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 0e982e2..ed1fc07 100755 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -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)