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

fix sponsor test, fixes from rebase, remove admin area check from application controller, fix admin menu layout

Browse source
This commit is contained in:
Stella Rouzi 2014-08-14 11:37:30 +03:00
parent 17ebad413e
commit ba6643a394
4 changed files with 17 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/conference_registration_controller.rb
View file

@ -64,8 +64,8 @@ class ConferenceRegistrationController < ApplicationController
registration.conference_id = @conference.id
registration.save!
if user.subscriptions.where(conference: conference).blank?
subscription = Subscription.new(conference_id: conference.id, user_id: user.id)
if user.subscriptions.where(conference: @conference).blank?
subscription = Subscription.new(conference_id: @conference.id, user_id: user.id)
redirect_message = subscription.save ? 'You are now Registered and will be receiving Email Notifications.' : 'You are now Registered.'
end
else