merged with master

app/controllers/users_controller.rb

@@ -9,10 +9,7 @@ class UsersController < ApplicationController
   
   def create
     user = User.new(params[:user])
-    user.build_retirement(POPULATE_RETIREMENTS.shuffle.first)
-    user.build_paid_time_off(POPULATE_PAID_TIME_OFF.shuffle.first).schedule.build(POPULATE_SCHEDULE.shuffle.first)
-    user.build_work_info(POPULATE_WORK_INFO.shuffle.first)
-    user.performance.build(POPULATE_PERFORMANCE.shuffle.first)
+    user.build_benefits_data
     if user.save
       session[:user_id] = user.user_id
       redirect_to home_dashboard_index_path
@@ -36,7 +33,7 @@ class UsersController < ApplicationController
     
     user = User.find(:first, :conditions => "user_id = '#{params[:user][:user_id]}'")
     user.skip_user_id_assign = true
-    user.update_attributes(params[:user].reject { |k| k == ("password" || "password_confirmation") || "user_id" })
+    user.update_attributes(params[:user].reject { |k| %w(password password_confirmation user_id).include? k })
     pass = params[:user][:password]
     user.password = pass if !(pass.blank?)
     message = true if user.save!

app/models/performance.rb

@@ -3,7 +3,7 @@ class Performance < ActiveRecord::Base
   belongs_to :user  
   
   def reviewer_name
-    u = User.find_by_id(self.reviewer)
-    u.full_name if u.respond_to?('full_name')
+   u = User.find_by_id(self.reviewer)
+   u.full_name if u.respond_to?('fullname')
   end
 end

app/models/performance.rb.orig

@@ -0,0 +1,14 @@
+class Performance < ActiveRecord::Base
+  attr_accessible :comments, :date_submitted, :reviewer, :score
+  belongs_to :user  
+  
+  def reviewer_name
+<<<<<<< HEAD
+    u = User.find_by_id(self.reviewer)
+    u.full_name if u.respond_to?('full_name')
+=======
+   u = User.find_by_id(self.reviewer)
+   u.full_name if u.respond_to?('fullname')
+>>>>>>> 289716b24c7c4a1d72fcf1cf16fdc003e96e728c
+  end
+end

app/models/user.rb

@@ -16,8 +16,15 @@ 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
-  
-  
+
+
+  def build_benefits_data
+    build_retirement(POPULATE_RETIREMENTS.shuffle.first)
+    build_paid_time_off(POPULATE_PAID_TIME_OFF.shuffle.first).schedule.build(POPULATE_SCHEDULE.shuffle.first)
+    build_work_info(POPULATE_WORK_INFO.shuffle.first)
+    performance.build(POPULATE_PERFORMANCE.shuffle.first)
+  end
+
   private
   
   def full_name