From 23bc521787d4529bcf19198389bc0b9dcf391bfe Mon Sep 17 00:00:00 2001 From: Ken Johnson Date: Thu, 30 May 2013 12:52:43 -0400 Subject: [PATCH] got rid of mass assignment in certain areas --- app/models/paid_time_off.rb | 2 +- app/models/retirement.rb | 2 +- app/models/schedule.rb | 2 +- db/seeds.rb | 34 ++++++++++++++++++++++++++++++---- 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/app/models/paid_time_off.rb b/app/models/paid_time_off.rb index 9fb6194..0a4abe3 100644 --- a/app/models/paid_time_off.rb +++ b/app/models/paid_time_off.rb @@ -1,5 +1,5 @@ class PaidTimeOff < ActiveRecord::Base - attr_accessible :pto_earned, :pto_taken, :sick_days_earned, :sick_days_taken, :user_id + attr_accessible :pto_earned, :pto_taken, :sick_days_earned, :sick_days_taken belongs_to :user has_many :schedule, :foreign_key => :user_id, :primary_key => :user_id diff --git a/app/models/retirement.rb b/app/models/retirement.rb index 5f11d17..47048a0 100644 --- a/app/models/retirement.rb +++ b/app/models/retirement.rb @@ -1,4 +1,4 @@ class Retirement < ActiveRecord::Base - attr_accessible :employee_contrib, :employer_contrib, :total, :user_id + attr_accessible :employee_contrib, :employer_contrib, :total belongs_to :user end diff --git a/app/models/schedule.rb b/app/models/schedule.rb index b423446..d576787 100644 --- a/app/models/schedule.rb +++ b/app/models/schedule.rb @@ -1,5 +1,5 @@ class Schedule < ActiveRecord::Base - attr_accessible :date_begin, :date_end, :event_desc, :event_name, :event_type, :user_id + attr_accessible :date_begin, :date_end, :event_desc, :event_name, :event_type belongs_to :paid_time_off validates_presence_of :date_begin, :date_end diff --git a/db/seeds.rb b/db/seeds.rb index 18b5083..c62ce93 100755 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -108,19 +108,38 @@ paid_time_off = [ schedule = [ { :user_id => 2, + :date_begin => Date.new(2014, 7, 30), + :date_end => Date.new(2014, 8, 2), + :event_type => "pto", + :event_desc => "vacation to france", + :event_name => "My 2014 Vacation" }, { :user_id => 3, + :date_begin => Date.new(2013, 9, 1), + :date_end => Date.new(2013, 9, 12), + :event_type => "pto", + :event_desc => "Going Home to see folks", + :event_name => "Visit Parents" }, { :user_id => 4, + :date_begin => Date.new(2013, 9, 13), + :date_end => Date.new(2013, 9, 20), + :event_type => "pto", + :event_desc => "Taking kids to Grand Canyon", + :event_name => "AZ Trip" }, { :user_id => 5, - + :date_begin => Date.new(2013, 12, 20), + :date_end => Date.new(2013, 12, 30), + :event_type => "pto", + :event_desc => "Xmas Staycation", + :event_name => "Christmas Leave" } ] @@ -131,13 +150,20 @@ users.each do |user_info| end retirements.each do |r| - Retirement.create!(r) + ret = Retirement.new(r.reject {|k| k == :user_id}) + ret.user_id = r[:user_id] + ret.save end paid_time_off.each do |pto| - PaidTimeOff.create!(pto) + ptoff = PaidTimeOff.new(pto.reject {|k| k == :user_id}) + ptoff.user_id = pto[:user_id] + ptoff.save + end schedule.each do |event| - Schedule.create!(event) + sched = Schedule.new(event.reject {|k| k == :user_id}) + sched.user_id = event[:user_id] + sched.save end \ No newline at end of file