Fix bug in track list, also send accept/reject mails

app/models/email_settings.rb

@@ -3,13 +3,13 @@ class EmailSettings < ActiveRecord::Base
                   :registration_email_template, :accepted_email_template, :rejected_email_template, :confirmed_email_template,
                   :registration_subject, :accepted_subject, :rejected_subject, :confirmed_without_registration_subject
 
-  def get_values(host, conference, person, event)
+  def get_values(conference, person, event = nil)
     h = {
         "email" => person.email,
         "name" => person.public_name,
         "conference" => conference.title,
-        "proposalslink" => Rails.application.routes.url_helpers.conference_proposal_index_url(conference.short_title, :host => host),
-        "registrationlink" => Rails.application.routes.url_helpers.register_conference_url(conference.short_title, :host => host)
+        "proposalslink" => Rails.application.routes.url_helpers.conference_proposal_url(conference.short_title, event, :host => OSEM_CONFIG["url_for_emails"]),
+        "registrationlink" => Rails.application.routes.url_helpers.register_conference_url(conference.short_title, :host => OSEM_CONFIG["url_for_emails"])
     }
 
     if !event.nil?
@@ -18,27 +18,27 @@ class EmailSettings < ActiveRecord::Base
     h
   end
 
-  def generate_registration_email(host, conference, person)
-    values = get_values(host, conference, person, nil)
+  def generate_registration_email(conference, person)
+    values = get_values(conference, person)
     template = self.registration_email_template
     parse_template(template, values)
   end
 
 
-  def generate_accepted_email(host, conference, person, event)
-    values = get_values(host, conference, person, event)
+  def generate_accepted_email(event)
+    values = get_values(event.conference, event.submitter, event)
     template = self.accepted_email_template
     parse_template(template, values)
   end
 
-  def generate_rejected_email(host, conference, person, event)
-    values = get_values(host, conference, person, event)
+  def generate_rejected_email(event)
+    values = get_values(event.conference, event.submitter, event)
     template = self.rejected_email_template
     parse_template(template, values)
   end
 
-  def confirmed_but_not_registered_email(host, conference, person, event)
-    values = get_values(host, conference, person, event)
+  def confirmed_but_not_registered_email(event)
+    values = get_values(event.conference, event.submitter, event)
     template = self.confirmed_email_template
     parse_template(template, values)
   end

app/models/event.rb

@@ -91,9 +91,15 @@ class Event < ActiveRecord::Base
   end
 
   def process_acceptance(options)
-    #if options[:send_mail]
-    #end
+    if options[:send_mail]
+      Mailbot.acceptance_mail(self).deliver
+    end
+  end
 
+  def process_rejection(options)
+    if options[:send_mail]
+      Mailbot.rejection_mail(self).deliver
+    end
   end
 
   def public_state