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

Fix proposal#update so that it shows errors when trying to create user

Browse source
This commit is contained in:
Stella Rouzi 2016-05-02 19:24:45 +03:00
parent 65ee166570
commit b9db2ed1d4
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/proposal_controller.rb
View file

@ -29,6 +29,8 @@ class ProposalController < ApplicationController
def create def create
@url = conference_program_proposal_index_path(@conference.short_title) @url = conference_program_proposal_index_path(@conference.short_title)
@event = Event.new(event_params)
@event.program = @program
# We allow proposal submission and sign up on same page. # We allow proposal submission and sign up on same page.
# If user is not signed in then first create new user and then sign them in # If user is not signed in then first create new user and then sign them in
@ -44,11 +46,6 @@ class ProposalController < ApplicationController
end end
end end
params[:event].delete :user
@event = Event.new(event_params)
@event.program = @program
# User which creates the proposal is both `submitter` and `speaker` of proposal # User which creates the proposal is both `submitter` and `speaker` of proposal
# by default. # by default.
# TODO: Allow submitter to add speakers to proposals # TODO: Allow submitter to add speakers to proposals