Merge pull request #567 from openSUSE/348

Adds dependent restricted association to some models

app/models/campaign.rb

@@ -4,7 +4,7 @@ class Campaign < ActiveRecord::Base
 
   validates :name, :utm_campaign, presence: true
 
-  has_many :targets
+  has_many :targets, dependent: :nullify
   belongs_to :conference
 
   ##

app/models/conference.rb

@@ -31,7 +31,7 @@ class Conference < ActiveRecord::Base
   has_one :call_for_paper, dependent: :destroy
   has_one :venue, dependent: :destroy
   has_many :social_events, dependent: :destroy
-  has_many :ticket_purchases
+  has_many :ticket_purchases, dependent: :destroy
   has_many :supporters, through: :ticket_purchases, source: :user
   has_many :tickets, dependent: :destroy
   has_many :dietary_choices, dependent: :destroy

app/models/difficulty_level.rb

@@ -2,7 +2,7 @@ class DifficultyLevel < ActiveRecord::Base
   attr_accessible :title, :description, :color, :conference_id
 
   belongs_to :conference
-  has_many :events
+  has_many :events, dependent: :nullify
 
   validates :title, presence: true
 end

app/models/event.rb

@@ -29,7 +29,7 @@ class Event < ActiveRecord::Base
   before_create :generate_guid
 
   validate :abstract_limit
-  validate :before_end_of_conference
+  validate :before_end_of_conference, on: :create
   validate :name_and_biography_exists
   validates :title, presence: true
   validates :abstract, presence: true

app/models/event_type.rb

@@ -3,6 +3,7 @@ class EventType < ActiveRecord::Base
                   :conference_id
 
   belongs_to :conference
+  has_many :events, dependent: :restrict_with_error
 
   validates :title, presence: true
   validates :length, numericality: {greater_than: 0}

app/models/room.rb

@@ -2,7 +2,7 @@ class Room < ActiveRecord::Base
   attr_accessible :name, :size, :conference_id
 
   belongs_to :conference
-  has_many :events
+  has_many :events, dependent: :nullify
 
   before_create :generate_guid
 

app/models/ticket.rb

@@ -1,6 +1,6 @@
 class Ticket < ActiveRecord::Base
   belongs_to :conference
-  has_many :ticket_purchases
+  has_many :ticket_purchases, dependent: :destroy
   has_many :buyers, -> { distinct }, through: :ticket_purchases, source: :user
 
   attr_accessible :conference, :title, :url, :description, :conference_id, :price_cents, :price_currency, :price

app/models/track.rb

@@ -1,7 +1,7 @@
 class Track < ActiveRecord::Base
   attr_accessible :name, :description, :color, :conference_id
   belongs_to :conference
-  has_many :events
+  has_many :events, dependent: :nullify
 
   before_create :generate_guid
   validates :name, presence: true

app/models/user.rb

@@ -38,7 +38,7 @@ class User < ActiveRecord::Base
   has_many :event_users, dependent: :destroy
   has_many :events, -> { uniq }, through: :event_users
   has_many :registrations, dependent: :destroy
-  has_many :ticket_purchases
+  has_many :ticket_purchases, dependent: :destroy
   has_many :tickets, through: :ticket_purchases, source: :ticket
   has_many :votes, dependent: :destroy
   has_many :voted_events, through: :votes, source: :events