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

identation fix

Browse source
This commit is contained in:
Chashmeet Singh 2016-03-02 00:08:42 +05:30
parent a23c376299
commit 3931bec2e2
4 changed files with 198 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/commercials_controller.rb
View file

@ -12,7 +12,8 @@ class CommercialsController < ApplicationController
redirect_to edit_conference_program_proposal_path(conference_id: @conference.short_title, id: @event.id, anchor: 'commercials-content'),
notice: 'Commercial was successfully created.'
else
redirect_to edit_conference_proposal_path(conference_id: @conference.short_title, id: @event.id, anchor: 'commercials-content'), error: "An error prohibited this Commercial from being saved: #{@commercial.errors.full_messages.join('. ')}."
redirect_to edit_conference_proposal_path(conference_id: @conference.short_title, id: @event.id, anchor: 'commercials-content'),
error: "An error prohibited this Commercial from being saved: #{@commercial.errors.full_messages.join('. ')}."
end
end
@ -21,7 +22,8 @@ class CommercialsController < ApplicationController
redirect_to edit_conference_program_proposal_path(conference_id: @conference.short_title, id: @event.id, anchor: 'commercials-content'),
notice: 'Commercial was successfully updated.'
else
redirect_to edit_conference_proposal_path(conference_id: @conference.short_title, id: @event.id, anchor: 'commercials-content'), error: "An error prohibited this Commercial from being saved: #{@commercial.errors.full_messages.join('. ')}."
redirect_to edit_conference_proposal_path(conference_id: @conference.short_title, id: @event.id, anchor: 'commercials-content'),
error: "An error prohibited this Commercial from being saved: #{@commercial.errors.full_messages.join('. ')}."
end
end

4
app/controllers/conference_registrations_controller.rb
View file

@ -63,9 +63,9 @@ class ConferenceRegistrationsController < ApplicationController
notice = 'You are now registered and will be receiving E-Mail notifications.'
if @conference.tickets.any? && !current_user.supports?(@conference)
redirect_to conference_tickets_path(@conference.short_title), notice: notice
redirect_to conference_tickets_path(@conference.short_title), notice: notice
else
redirect_to conference_conference_registrations_path(@conference.short_title), notice: notice
redirect_to conference_conference_registrations_path(@conference.short_title), notice: notice
end
else
render :new, error: "Could not create your registration for #{@conference.title}: "\

6
app/controllers/proposal_controller.rb
View file

@ -54,7 +54,8 @@ class ProposalController < ApplicationController
ahoy.track 'Event submission', title: 'New submission'
redirect_to conference_program_proposal_index_path(@conference.short_title), notice: 'Proposal was successfully submitted.'
redirect_to conference_program_proposal_index_path(@conference.short_title),
notice: 'Proposal was successfully submitted.'
end
def update
@ -62,8 +63,7 @@ class ProposalController < ApplicationController
@url = conference_program_proposal_path(@conference.short_title, params[:id])
if !@event.update(event_params)
render action: 'new', error: "Could not update proposal: #{@event.errors.full_messages.join(', ')}"
render action: 'new', error: "Could not update proposal: #{@event.errors.full_messages.join(', ')}"
return
end