gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Matt Barringer 2013-01-17 13:56:05 +01:00
parent f10d5e4c0e
commit caa0dec6c4
7 changed files with 70 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/events_controller.rb
View file

@ -17,7 +17,7 @@ class Admin::EventsController < ApplicationController
def show
@event = @conference.events.find(params[:id])
@tracks = Track.all
@tracks = @conference.tracks
@comments = @event.root_comments
@comment_count = @event.comment_threads.count
end

2
app/controllers/conference_registration_controller.rb
View file

@ -39,7 +39,7 @@ class ConferenceRegistrationController < ApplicationController
if update_registration
redirect_message = "Registration updated."
else
Mailbot.registration_mail(request.host_with_port, conference, current_user.person).deliver
Mailbot.registration_mail(conference, current_user.person).deliver
end
redirect_to(register_conference_path(:id => conference.short_title), :notice => redirect_message)
end