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

Merge fafc06dd6e into 38bc2e3c3a

Browse source
This commit is contained in:
Stella Rouzi 2015-12-08 21:20:00 +00:00
commit 2eddbdb614
38 changed files with 222 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/controllers/admin/call_for_papers_controller.rb
View file

@ -15,8 +15,8 @@ module Admin
@call_for_paper = @conference.build_call_for_paper(call_for_paper_params)
if @call_for_paper.save
redirect_to admin_conference_call_for_paper_path,
notice: 'Call for papers successfully created.'
flash[:notice] = 'Call for papers successfully created.'
redirect_to admin_conference_call_for_paper_path
else
flash[:error] = "Creating the call for papers failed. #{@call_for_paper.errors.full_messages.join('. ')}."
render :new
@ -34,8 +34,9 @@ module Admin
if @cfp.update_attributes(params[:call_for_paper])
Mailbot.delay.send_on_call_for_papers_dates_updated(@conference) if send_mail_on_cfp_dates_updated
Mailbot.delay.send_on_schedule_public(@conference) if send_mail_on_schedule_public
redirect_to(admin_conference_call_for_paper_path(@conference.short_title),
notice: 'Call for papers successfully updated.')
flash[:notice] = 'Call for papers successfully updated.'
redirect_to admin_conference_call_for_paper_path(@conference.short_title)
else
flash[:error] = "Updating call for papers failed. #{@cfp.errors.to_a.join('. ')}."
render :new
@ -44,10 +45,12 @@ module Admin
def destroy
if @call_for_paper.destroy
redirect_to admin_conference_call_for_paper_path, notice: 'Call for Papers was successfully deleted.'
flash[:notice] = 'Call for Papers was successfully deleted.'
redirect_to admin_conference_call_for_paper_path
else
redirect_to admin_conference_call_for_paper_path, error: 'An error prohibited this Call for Papers from being destroyed: '\
"#{@call_for_paper.errors.full_messages.join('. ')}."
flash[:error] = 'An error prohibited this Call for Papers from being destroyed: '\
"#{@call_for_paper.errors.full_messages.join('. ')}."
redirect_to admin_conference_call_for_paper_path
end
end

10
app/controllers/admin/campaigns_controller.rb
View file

@ -13,7 +13,7 @@ module Admin
if @conference.save
flash[:notice] = 'Campaign successfully created.'
redirect_to(admin_conference_campaigns_path(conference_id: @conference.short_title))
redirect_to admin_conference_campaigns_path(conference_id: @conference.short_title)
else
flash[:error] = 'Campaign creation failed. ' + @campaign.errors.full_messages.to_sentence
render action: 'new'
@ -27,7 +27,7 @@ module Admin
def update
if @campaign.update_attributes(params[:campaign])
flash[:notice] = "Campaign '#{@campaign.name}' successfully updated."
redirect_to(admin_conference_campaigns_path(conference_id: @conference.short_title))
redirect_to admin_conference_campaigns_path(conference_id: @conference.short_title)
else
flash[:error] = "Campaign update failed. #{@campaign.errors.full_messages.to_sentence}"
render action: 'edit'
@ -37,11 +37,11 @@ module Admin
def destroy
if @campaign.destroy
flash[:notice] = "Campaign '#{@campaign.name}' successfully deleted."
redirect_to(admin_conference_campaigns_path(conference_id: @conference.short_title))
redirect_to admin_conference_campaigns_path(conference_id: @conference.short_title)
else
flash[:error] = "Delete of Campaign for #{@conference.short_title} failed." \
"#{@campaign.errors.full_messages.join('. ')}."
redirect_to(admin_conference_campaigns_path(conference_id: @conference.short_title))
"#{@campaign.errors.full_messages.join('. ')}."
redirect_to admin_conference_campaigns_path(conference_id: @conference.short_title)
end
end
end

18
app/controllers/admin/commercials_controller.rb
View file

@ -19,8 +19,8 @@ module Admin
authorize! :create, @commercial
if @commercial.save
redirect_to admin_conference_commercials_path,
notice: 'Commercial was successfully created.'
flash[:notice] = 'Commercial was successfully created.'
redirect_to admin_conference_commercials_path
else
flash[:error] = "An error prohibited this Commercial from being saved: #{@commercial.errors.full_messages.join('. ')}."
render :new
@ -29,8 +29,8 @@ module Admin
def update
if @commercial.update(commercial_params)
redirect_to admin_conference_commercials_path,
notice: 'Commercial was successfully updated.'
flash[:notice] = 'Commercial was successfully updated.'
redirect_to admin_conference_commercials_path
else
flash[:error] = "An error prohibited this Commercial from being saved: #{@commercial.errors.full_messages.join('. ')}."
render :edit
@ -38,8 +38,14 @@ module Admin
end
def destroy
@commercial.destroy
redirect_to admin_conference_commercials_path, notice: 'Commercial was successfully destroyed.'
if @commercial.destroy
flash[:notice] = 'Commercial was successfully destroyed.'
redirect_to admin_conference_commercials_path
else
flash[:error] = 'Commercial was not destroyed.'\
"#{@commercial.errors.full_messages.join('. ')}"
redirect_to admin_conference_commercials_path
end
end
private

16
app/controllers/admin/conference_controller.rb
View file

@ -69,8 +69,9 @@ module Admin
@conference.save
# user that creates the conference becomes organizer of that conference
current_user.add_role :organizer, @conference
redirect_to(admin_conference_path(id: @conference.short_title),
notice: 'Conference was successfully created.')
flash[:notice] = 'Conference was successfully created.'
redirect_to admin_conference_path(id: @conference.short_title)
else
render action: 'new'
end
@ -84,12 +85,13 @@ module Admin
if @conference.update_attributes(params[:conference])
Mailbot.delay.conference_date_update_mail(@conference) if send_mail_on_conf_update
redirect_to(edit_admin_conference_path(id: @conference.short_title),
notice: 'Conference was successfully updated.')
flash[:notice] = 'Conference was successfully updated.'
redirect_to edit_admin_conference_path(id: @conference.short_title)
else
redirect_to(edit_admin_conference_path(id: short_title),
alert: 'Updating conference failed. ' \
"#{@conference.errors.full_messages.join('. ')}.")
flash[:error] = 'Updating conference failed. ' \
"#{@conference.errors.full_messages.join('. ')}."
redirect_to edit_admin_conference_path(id: short_title)
end
end

4
app/controllers/admin/contacts_controller.rb
View file

@ -12,8 +12,10 @@ module Admin
# PATCH/PUT /:conference/contact
def update
if @contact.update(contact_params)
redirect_to edit_admin_conference_contact_path, notice: 'Contact details were successfully updated.'
flash[:notice] = 'Contact details were successfully updated.'
redirect_to edit_admin_conference_contact_path
else
flash[:error] = 'Contact details were not updated.'
render :edit
end
end

10
app/controllers/admin/difficulty_levels_controller.rb
View file

@ -17,7 +17,7 @@ module Admin
@difficulty_level = @conference.difficulty_levels.new(difficulty_level_params)
if @difficulty_level.save
flash[:notice] = 'Difficulty level successfully created.'
redirect_to(admin_conference_difficulty_levels_path(conference_id: @conference.short_title))
redirect_to admin_conference_difficulty_levels_path(conference_id: @conference.short_title)
else
flash[:error] = "Creating difficulty level failed: #{@difficulty_level.errors.full_messages.join('. ')}."
render :new
@ -27,7 +27,7 @@ module Admin
def update
if @difficulty_level.update_attributes(difficulty_level_params)
flash[:notice] = 'Difficulty level successfully updated.'
redirect_to(admin_conference_difficulty_levels_path(conference_id: @conference.short_title))
redirect_to admin_conference_difficulty_levels_path(conference_id: @conference.short_title)
else
flash[:error] = "Update difficulty level failed: #{@difficulty_level.errors.full_messages.join('. ')}."
render :edit
@ -37,11 +37,11 @@ module Admin
def destroy
if @difficulty_level.destroy
flash[:notice] = 'Difficulty level successfully deleted.'
redirect_to(admin_conference_difficulty_levels_path(conference_id: @conference.short_title))
redirect_to admin_conference_difficulty_levels_path(conference_id: @conference.short_title)
else
flash[:error] = 'Deleting difficulty level type failed! ' \
"#{@difficulty_level.errors.full_messages.join('. ')}."
redirect_to(admin_conference_difficulty_levels_path(conference_id: @conference.short_title))
"#{@difficulty_level.errors.full_messages.join('. ')}."
redirect_to admin_conference_difficulty_levels_path(conference_id: @conference.short_title)
end
end

6
app/controllers/admin/emails_controller.rb
View file

@ -5,9 +5,9 @@ module Admin
def update
@conference.email_settings.update_attributes(params[:email_settings])
redirect_to(admin_conference_emails_path(
@conference.short_title),
notice: 'Settings have been successfully updated.')
flash[:notice] = 'Settings have been successfully updated.'
redirect_to admin_conference_emails_path(@conference.short_title)
end
def index

10
app/controllers/admin/event_types_controller.rb
View file

@ -17,7 +17,7 @@ module Admin
@event_type = @conference.event_types.new(event_type_params)
if @event_type.save
flash[:notice] = 'Event type successfully created.'
redirect_to(admin_conference_event_types_path(conference_id: @conference.short_title))
redirect_to admin_conference_event_types_path(conference_id: @conference.short_title)
else
flash[:error] = "Creating event type failed: #{@event_type.errors.full_messages.join('. ')}."
render :new
@ -27,7 +27,7 @@ module Admin
def update
if @event_type.update_attributes(event_type_params)
flash[:notice] = 'Event type successfully updated.'
redirect_to(admin_conference_event_types_path(conference_id: @conference.short_title))
redirect_to admin_conference_event_types_path(conference_id: @conference.short_title)
else
flash[:error] = "Update event type failed: #{@event_type.errors.full_messages.join('. ')}."
render :edit
@ -37,11 +37,11 @@ module Admin
def destroy
if @event_type.destroy
flash[:notice] = 'Event type successfully deleted.'
redirect_to(admin_conference_event_types_path(conference_id: @conference.short_title))
redirect_to admin_conference_event_types_path(conference_id: @conference.short_title)
else
flash[:error] = 'Destroying event type failed! ' \
"#{@event_type.errors.full_messages.join('. ')}."
redirect_to(admin_conference_event_types_path(conference_id: @conference.short_title))
"#{@event_type.errors.full_messages.join('. ')}."
redirect_to admin_conference_event_types_path(conference_id: @conference.short_title)
end
end

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

@ -170,8 +170,8 @@ module Admin
def get_event
@event = @conference.events.find_by_id(params[:id])
if !@event
redirect_to(admin_conference_events_path(conference_id: @conference.short_title),
alert: 'Error! Could not find event!') && return
flash[:error] = 'Error! Could not find event!'
redirect_to admin_conference_events_path(conference_id: @conference.short_title) && return
end
@event
end

18
app/controllers/admin/lodgings_controller.rb
View file

@ -13,8 +13,8 @@ module Admin
def create
@lodging = @conference.lodgings.new(lodging_params)
if @lodging.save
redirect_to(admin_conference_lodgings_path(conference_id: @conference.short_title),
notice: 'Lodging successfully created.')
flash[:notice] = 'Lodging successfully created.'
redirect_to admin_conference_lodgings_path(conference_id: @conference.short_title)
else
flash[:error] = "Creating Lodging failed: #{@lodging.errors.full_messages.join('. ')}."
render :new
@ -25,8 +25,8 @@ module Admin
def update
if @lodging.update_attributes(lodging_params)
redirect_to(admin_conference_lodgings_path(conference_id: @conference.short_title),
notice: 'Lodging successfully updated.')
flash[:notice] = 'Lodging successfully updated.'
redirect_to admin_conference_lodgings_path(conference_id: @conference.short_title)
else
flash[:error] = "Update Lodging failed: #{@lodging.errors.full_messages.join('. ')}."
render :edit
@ -35,12 +35,12 @@ module Admin
def destroy
if @lodging.destroy
redirect_to(admin_conference_lodgings_path(conference_id: @conference.short_title),
notice: 'Lodging successfully deleted.')
flash[:notice] = 'Lodging successfully deleted.'
redirect_to admin_conference_lodgings_path(conference_id: @conference.short_title)
else
redirect_to(admin_conference_lodgings_path(conference_id: @conference.short_title),
error: 'Deleting lodging failed.' \
"#{@lodging.errors.full_messages.join('. ')}.")
flash[:error] = 'Deleting lodging failed.' \
"#{@lodging.errors.full_messages.join('. ')}."
redirect_to admin_conference_lodgings_path(conference_id: @conference.short_title)
end
end

17
app/controllers/admin/registration_periods_controller.rb
View file

@ -13,8 +13,9 @@ module Admin
if @registration_period.save
Mailbot.delay.conference_registration_date_update_mail(@conference) if send_mail_on_reg_update
redirect_to admin_conference_registration_period_path(@conference.short_title),
notice: 'Registration Period successfully updated.'
flash[:notice] = 'Registration Period successfully updated.'
redirect_to admin_conference_registration_period_path(@conference.short_title)
else
flash[:error] = "An error prohibited the Registration Period from being saved: #{@registration_period.errors.full_messages.join('. ')}."
render :new
@ -33,19 +34,21 @@ module Admin
if @registration_period.update(registration_period)
Mailbot.delay.conference_registration_date_update_mail(@conference) if send_mail_on_reg_update
redirect_to admin_conference_registration_period_path(@conference.short_title),
notice: 'Registration Period successfully updated.'
flash[:notice] = 'Registration Period successfully updated.'
redirect_to admin_conference_registration_period_path(@conference.short_title)
else
flash[:error] = 'An error prohibited the Registration Period from being saved: ' \
"#{@registration_period.errors.full_messages.join('. ')}."
"#{@registration_period.errors.full_messages.join('. ')}."
render :edit
end
end
def destroy
@registration_period.destroy
redirect_to admin_conference_registration_period_path,
notice: 'Registration Period was successfully destroyed.'
flash[:notice] = 'Registration Period was successfully destroyed.'
redirect_to admin_conference_registration_period_path
end
private

13
app/controllers/admin/registrations_controller.rb
View file

@ -16,8 +16,8 @@ module Admin
def update
@registration.update_attributes(registration_params)
if @registration.save
redirect_to admin_conference_registrations_path(@conference.short_title),
notice: "Successfully updated registration for #{@registration.user.email}!"
flash[:notice] = "Successfully updated registration for #{@registration.user.email}!"
redirect_to admin_conference_registrations_path(@conference.short_title)
else
flash[:error] = "An error prohibited the Registration for #{@registration.user.email}: "\
"#{@registration.errors.full_messages.join('. ')}."
@ -28,11 +28,12 @@ module Admin
def destroy
if can? :destroy, @registration
@registration.destroy
redirect_to admin_conference_registrations_path(@conference.short_title),
notice: "Deleted registration for #{@user.name}!"
flash[:notice] = "Deleted registration for #{@user.name}!"
redirect_to admin_conference_registrations_path(@conference.short_title)
else
redirect_to(admin_conference_registrations_path(@conference.short_title),
error: 'You must be an admin to delete a registration.')
flash[:error] = 'You must be an admin to delete a registration.'
redirect_to admin_conference_registrations_path(@conference.short_title)
end
end

8
app/controllers/admin/rooms_controller.rb
View file

@ -17,7 +17,7 @@ module Admin
@room = @conference.rooms.new(room_params)
if @room.save
flash[:notice] = 'Room successfully created.'
redirect_to(admin_conference_rooms_path(conference_id: @conference.short_title))
redirect_to admin_conference_rooms_path(conference_id: @conference.short_title)
else
flash[:error] = "Creating Room failed: #{@room.errors.full_messages.join('. ')}."
render :new
@ -27,7 +27,7 @@ module Admin
def update
if @room.update_attributes(room_params)
flash[:notice] = 'Room successfully updated.'
redirect_to(admin_conference_rooms_path(conference_id: @conference.short_title))
redirect_to admin_conference_rooms_path(conference_id: @conference.short_title)
else
flash[:error] = "Update Room failed: #{@room.errors.full_messages.join('. ')}."
render :edit
@ -37,10 +37,10 @@ module Admin
def destroy
if @room.destroy
flash[:notice] = 'Room successfully deleted.'
redirect_to(admin_conference_rooms_path(conference_id: @conference.short_title))
redirect_to admin_conference_rooms_path(conference_id: @conference.short_title)
else
flash[:error] = "Destroying room failed! #{@room.errors.full_messages.join('. ')}."
redirect_to(admin_conference_rooms_path(conference_id: @conference.short_title))
redirect_to admin_conference_rooms_path(conference_id: @conference.short_title)
end
end

14
app/controllers/admin/splashpages_controller.rb
View file

@ -15,9 +15,11 @@ module Admin
@splashpage = @conference.build_splashpage(splashpage_params)
if @splashpage.save
redirect_to admin_conference_splashpage_path,
notice: 'Splashpage successfully created.'
flash[:notice] = 'Splashpage successfully created.'
redirect_to admin_conference_splashpage_path
else
flash[:error] = 'Splashpage could not be created.'\
"#{@splashpage.errors.full_messages.join('. ')}."
render :new
end
end
@ -33,10 +35,12 @@ module Admin
def destroy
if @splashpage.destroy
redirect_to admin_conference_splashpage_path, notice: 'Splashpage was successfully destroyed.'
flash[:notice] = 'Splashpage was successfully destroyed.'
redirect_to admin_conference_splashpage_path
else
redirect_to admin_conference_splashpage_path, alert: 'An error prohibited this Splashpage from being destroyed: '\
"#{@splashpage.errors.full_messages.join('. ')}."
flash[:error] = 'An error prohibited this Splashpage from being destroyed: '\
"#{@splashpage.errors.full_messages.join('. ')}."
redirect_to admin_conference_splashpage_path
end
end

19
app/controllers/admin/sponsors_controller.rb
View file

@ -16,8 +16,8 @@ module Admin
def create
@sponsor = @conference.sponsors.new(sponsor_params)
if @sponsor.save
redirect_to(admin_conference_sponsors_path(conference_id: @conference.short_title),
notice: 'Sponsor successfully created.')
flash[:notice] = 'Sponsor successfully created.'
redirect_to admin_conference_sponsors_path(conference_id: @conference.short_title)
else
flash[:error] = "Creating sponsor failed: #{@sponsor.errors.full_messages.join('. ')}."
render :new
@ -26,9 +26,8 @@ module Admin
def update
if @sponsor.update_attributes(sponsor_params)
redirect_to(admin_conference_sponsors_path(
conference_id: @conference.short_title),
notice: 'Sponsor successfully updated.')
flash[:notice] = 'Sponsor successfully updated.'
redirect_to admin_conference_sponsors_path(conference_id: @conference.short_title)
else
flash[:error] = "Update sponsor failed: #{@sponsor.errors.full_messages.join('. ')}."
render :edit
@ -37,12 +36,12 @@ module Admin
def destroy
if @sponsor.destroy
redirect_to(admin_conference_sponsors_path(conference_id: @conference.short_title),
notice: 'Sponsor successfully deleted.')
flash[:notice] = 'Sponsor successfully deleted.'
redirect_to admin_conference_sponsors_path(conference_id: @conference.short_title)
else
redirect_to(admin_conference_sponsors_path(conference_id: @conference.short_title),
error: 'Deleting sponsor failed! ' \
"#{@sponsor.errors.full_messages.join('. ')}.")
flash[:error] = 'Deleting sponsor failed! ' \
"#{@sponsor.errors.full_messages.join('. ')}."
redirect_to admin_conference_sponsors_path(conference_id: @conference.short_title)
end
end

23
app/controllers/admin/sponsorship_levels_controller.rb
View file

@ -16,8 +16,8 @@ module Admin
def create
@sponsorship_level = @conference.sponsorship_levels.new(sponsorship_level_params)
if @sponsorship_level.save
redirect_to(admin_conference_sponsorship_levels_path(conference_id: @conference.short_title),
notice: 'Sponsorship level successfully created.')
flash[:notice] = 'Sponsorship level successfully created.'
redirect_to admin_conference_sponsorship_levels_path(conference_id: @conference.short_title)
else
flash[:error] = "Creating Sponsorship Level failed: #{@sponsorship_level.errors.full_messages.join('. ')}."
render :new
@ -26,9 +26,8 @@ module Admin
def update
if @sponsorship_level.update_attributes(sponsorship_level_params)
redirect_to(admin_conference_sponsorship_levels_path(
conference_id: @conference.short_title),
notice: 'Sponsorship level successfully updated.')
flash[:notice] = 'Sponsorship level successfully updated.'
redirect_to admin_conference_sponsorship_levels_path(conference_id: @conference.short_title)
else
flash[:error] = "Update Sponsorship level failed: #{@sponsorship_level.errors.full_messages.join('. ')}."
render :edit
@ -37,23 +36,23 @@ module Admin
def destroy
if @sponsorship_level.destroy
redirect_to(admin_conference_sponsorship_levels_path(conference_id: @conference.short_title),
notice: 'Sponsorship level successfully deleted.')
flash[:notice] = 'Sponsorship level successfully deleted.'
redirect_to admin_conference_sponsorship_levels_path(conference_id: @conference.short_title)
else
redirect_to(admin_conference_sponsorship_levels_path(conference_id: @conference.short_title),
error: 'Deleting sponsorship level failed! ' \
"#{@sponsorship_level.errors.full_messages.join('. ')}.")
flash[:error] = 'Deleting sponsorship level failed! ' \
"#{@sponsorship_level.errors.full_messages.join('. ')}."
redirect_to admin_conference_sponsorship_levels_path(conference_id: @conference.short_title)
end
end
def up
@sponsorship_level.move_higher
redirect_to(admin_conference_sponsorship_levels_path(conference_id: @conference.short_title))
redirect_to admin_conference_sponsorship_levels_path(conference_id: @conference.short_title)
end
def down
@sponsorship_level.move_lower
redirect_to(admin_conference_sponsorship_levels_path(conference_id: @conference.short_title))
redirect_to admin_conference_sponsorship_levels_path(conference_id: @conference.short_title)
end
private

18
app/controllers/admin/targets_controller.rb
View file

@ -14,8 +14,8 @@ module Admin
def create
@target = @conference.targets.new(target_params)
if @target.save(target_params)
redirect_to(admin_conference_targets_path(conference_id: @conference.short_title),
notice: 'Target successfully created.')
flash[:notice] = 'Target successfully created.'
redirect_to admin_conference_targets_path(conference_id: @conference.short_title)
else
flash[:error] = "Creating target failed: #{@target.errors.full_messages.join('. ')}."
render :new
@ -26,8 +26,8 @@ module Admin
def update
if @target.update_attributes(target_params)
redirect_to(admin_conference_targets_path(conference_id: @conference.short_title),
notice: 'Target successfully updated.')
flash[:notice] = 'Target successfully updated.'
redirect_to admin_conference_targets_path(conference_id: @conference.short_title)
else
flash[:error] = "Target update failed: #{@target.errors.full_messages.join('. ')}."
render :edit
@ -36,12 +36,12 @@ module Admin
def destroy
if @target.destroy
redirect_to(admin_conference_targets_path(conference_id: @conference.short_title),
notice: 'Target successfully destroyed.')
flash[:notice] = 'Target successfully destroyed.'
redirect_to admin_conference_targets_path(conference_id: @conference.short_title)
else
redirect_to(admin_conference_targets_path(conference_id: @conference.short_title),
error: 'Target was successfully destroyed.' \
"#{@target.errors.full_messages.join('. ')}.")
flash[:error] = 'Target was successfully destroyed.' \
"#{@target.errors.full_messages.join('. ')}."
redirect_to admin_conference_targets_path(conference_id: @conference.short_title)
end
end

18
app/controllers/admin/tickets_controller.rb
View file

@ -14,8 +14,8 @@ module Admin
def create
@ticket = @conference.tickets.new(ticket_params)
if @ticket.save(ticket_params)
redirect_to(admin_conference_tickets_path(conference_id: @conference.short_title),
notice: 'Ticket successfully created.')
flash[:notice] = 'Ticket successfully created.'
redirect_to admin_conference_tickets_path(conference_id: @conference.short_title)
else
flash[:error] = "Creating Ticket failed: #{@ticket.errors.full_messages.join('. ')}."
render :new
@ -26,8 +26,8 @@ module Admin
def update
if @ticket.update_attributes(ticket_params)
redirect_to(admin_conference_tickets_path(conference_id: @conference.short_title),
notice: 'Ticket successfully updated.')
flash[:notice] = 'Ticket successfully updated.'
redirect_to admin_conference_tickets_path(conference_id: @conference.short_title)
else
flash[:error] = "Ticket update failed: #{@ticket.errors.full_messages.join('. ')}."
render :edit
@ -36,12 +36,12 @@ module Admin
def destroy
if @ticket.destroy
redirect_to(admin_conference_tickets_path(conference_id: @conference.short_title),
notice: 'Ticket successfully destroyed.')
flash[:notice] = 'Ticket successfully destroyed.'
redirect_to admin_conference_tickets_path(conference_id: @conference.short_title)
else
redirect_to(admin_conference_tickets_path(conference_id: @conference.short_title),
error: 'Ticket was successfully destroyed.' \
"#{@ticket.errors.full_messages.join('. ')}.")
flash[:error] = 'Ticket was successfully destroyed.' \
"#{@ticket.errors.full_messages.join('. ')}."
redirect_to admin_conference_tickets_path(conference_id: @conference.short_title)
end
end

8
app/controllers/admin/tracks_controller.rb
View file

@ -20,7 +20,7 @@ module Admin
@track = @conference.tracks.new(track_params)
if @track.save
flash[:notice] = 'Track successfully created.'
redirect_to(admin_conference_tracks_path(conference_id: @conference.short_title))
redirect_to admin_conference_tracks_path(conference_id: @conference.short_title)
else
flash[:error] = "Creating Track failed: #{@track.errors.full_messages.join('. ')}."
render :new
@ -32,7 +32,7 @@ module Admin
def update
if @track.update_attributes(track_params)
flash[:notice] = 'Track successfully updated.'
redirect_to(admin_conference_tracks_path(conference_id: @conference.short_title))
redirect_to admin_conference_tracks_path(conference_id: @conference.short_title)
else
flash[:error] = "Track update failed: #{@track.errors.full_messages.join('. ')}."
render :edit
@ -42,10 +42,10 @@ module Admin
def destroy
if @track.destroy
flash[:notice] = 'Track successfully deleted.'
redirect_to(admin_conference_tracks_path(conference_id: @conference.short_title))
redirect_to admin_conference_tracks_path(conference_id: @conference.short_title)
else
flash[:error] = "Track couldn't be deleted. #{@track.errors.full_messages.join('. ')}."
redirect_to(admin_conference_tracks_path(conference_id: @conference.short_title))
redirect_to admin_conference_tracks_path(conference_id: @conference.short_title)
end
end

6
app/controllers/admin/users_controller.rb
View file

@ -28,9 +28,11 @@ module Admin
end
if @user.update_attributes(params[:user])
redirect_to admin_users_path, notice: "Updated #{@user.name} (#{@user.email})!" + message
flash[:notice] = "Updated #{@user.name} (#{@user.email})!" + message
redirect_to admin_users_path
else
redirect_to admin_users_path, alert: "Could not update #{@user.name} (#{@user.email}). #{@user.errors.full_messages.join('. ')}."
flash[:error] = "Could not update #{@user.name} (#{@user.email}). #{@user.errors.full_messages.join('. ')}."
render :edit
end
end

16
app/controllers/admin/venues_controller.rb
View file

@ -15,8 +15,8 @@ module Admin
@venue = @conference.build_venue(venue_params)
if @venue.save
redirect_to admin_conference_venue_path,
notice: 'Venue was successfully created.'
flash[:notice] = 'Venue was successfully created.'
redirect_to admin_conference_venue_path
else
render :new
end
@ -24,8 +24,8 @@ module Admin
def update
if @venue.update_attributes(venue_params)
redirect_to(admin_conference_venue_path(conference_id: @conference.short_title),
notice: 'Venue was successfully updated.')
flash[:notice] = 'Venue was successfully updated.'
redirect_to admin_conference_venue_path(conference_id: @conference.short_title)
else
flash[:error] = "Update venue failed: #{@venue.errors.full_messages.join('. ')}."
render :edit
@ -34,10 +34,12 @@ module Admin
def destroy
if @venue.destroy
redirect_to admin_conference_venue_path, notice: 'Venue was successfully deleted.'
flash[:notice] = 'Venue was successfully deleted.'
redirect_to admin_conference_venue_path
else
redirect_to admin_conference_venue_path, alert: 'An error prohibited this Venue from being destroyed: '\
"#{@venue.errors.full_messages.join('. ')}."
flash[:error] = 'An error prohibited this Venue from being destroyed: '\
"#{@venue.errors.full_messages.join('. ')}."
redirect_to admin_conference_venue_path
end
end

6
app/controllers/admin/volunteers_controller.rb
View file

@ -25,9 +25,11 @@ module Admin
def update
if can_manage_volunteers(@conference)
if @conference.update_attributes(params[:conference])
redirect_to(admin_conference_volunteers_info_path(conference_id: params[:conference_id]), notice: 'Volunteering options were successfully updated.')
flash[:notice] = 'Volunteering options were successfully updated.'
redirect_to admin_conference_volunteers_info_path(conference_id: params[:conference_id])
else
redirect_to(admin_conference_volunteers_info_path(conference_id: params[:conference_id]), alert: "Volunteering options update failed: #{@conference.errors.full_messages.join '. '}")
flash[:error] = "Volunteering options update failed: #{@conference.errors.full_messages.join '. '}"
redirect_to admin_conference_volunteers_info_path(conference_id: params[:conference_id])
end
else
authorize! :index, :volunteer