team-alpha/railsgoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I believe this has resolved the dependent destruction and we can close issue #18

Browse Source
This commit is contained in:
Ken Johnson
2013-06-02 13:08:56 -04:00
parent 4e445375fa
commit 06dce1f8b2
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/paid_time_off.rb
+1 -1
View File
@@ -1,7 +1,7 @@
class PaidTimeOff < ActiveRecord::Base
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
has_many :schedule, :foreign_key => :user_id, :primary_key => :user_id, :dependent => :destroy
def sick_days_remaining
self.sick_days_earned - self.sick_days_taken
app/models/user.rb
+4 -4
View File
@@ -10,10 +10,10 @@ class User < ActiveRecord::Base
validates_format_of :email, :with => /.+@.+\..+/i
attr_accessor :skip_user_id_assign
before_save :assign_user_id, :on => :create
has_one :retirement, :foreign_key => :user_id, :primary_key => :user_id
has_one :paid_time_off, :foreign_key => :user_id, :primary_key => :user_id
has_one :work_info, :foreign_key => :user_id, :primary_key => :user_id
has_many :performance, :foreign_key => :user_id, :primary_key => :user_id
has_one :retirement, :foreign_key => :user_id, :primary_key => :user_id, :dependent => :destroy
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 full_name