From 408457a76591157cf6d181f5af83cdd4e711ba17 Mon Sep 17 00:00:00 2001 From: Petko Bordjukov Date: Fri, 17 Apr 2015 02:02:17 +0300 Subject: [PATCH] Remove unneeded functionality from Event --- app/models/event.rb | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/app/models/event.rb b/app/models/event.rb index 284707e..d13e3af 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -3,7 +3,6 @@ class Event < ActiveRecord::Base validates :length, presence: true, numericality: {only_integer: true, greater_than: 0} validates :abstract, presence: true validates :description, presence: true - validates :track_id, inclusion: { in: (Conference.current.try(:tracks) || []).map(&:id) } validates :agreement, acceptance: true belongs_to :track @@ -12,8 +11,6 @@ class Event < ActiveRecord::Base belongs_to :candidate_speaker, class_name: 'User', foreign_key: 'user_id' has_and_belongs_to_many :speakers, class_name: 'SpeakerProfile' - after_create :send_new_event_notification - enum state: [:undecided, :approved, :rejected, :backup] scope :confirmed, -> { where.not confirmed_at: nil } @@ -22,18 +19,13 @@ class Event < ActiveRecord::Base STATE_TO_GLYPH = {undecided: 'question-sign', rejected: 'remove', approved: 'ok', backup: 'retweet'} STATE_TO_CLASS = {undecided: 'warning', rejected: 'danger', approved: 'success', backup: 'info'} - def send_acceptance_notification! - EventMailer.acceptance_notification(self).deliver - touch :acceptance_notification_sent_at - end - def confirmed? !!confirmed_at end private - def send_new_event_notification - EventMailer.new_event_notification(self).deliver + def self.inheritance_column + 'something' end end