validate track name, render instead of redirect for campaigns, fix view for new sponsor

This commit is contained in:
Stella 2014-11-30 17:50:23 +02:00
parent 5fb7e5cbef
commit 2c768a358a
3 changed files with 9 additions and 11 deletions

View file

@ -15,9 +15,8 @@ module Admin
redirect_to(admin_conference_campaigns_path(conference_id: @conference.short_title),
notice: 'Campaign successfully created.')
else
redirect_to(new_admin_conference_campaign_path(conference_id: @conference.short_title),
alert: "Creating of Campaign for #{@conference.short_title} failed." \
"#{@campaign.errors.full_messages.join('. ')}.")
flash[:error] = 'Campaign creation failed. ' + @campaign.errors.full_messages.to_sentence
render action: 'new'
end
end
@ -31,11 +30,8 @@ module Admin
conference_id: @conference.short_title),
notice: "Campaign '#{@campaign.name}' successfully updated.")
else
redirect_to(edit_admin_conference_campaign_path(
conference_id: @conference.short_title,
id: @campaign.id),
alert: "Update of Campaign for #{@conference.short_title} failed." \
"#{@campaign.errors.full_messages.join('. ')}.")
flash[:error] = 'Campaign update failed. ' + @campaign.errors.full_messages.to_sentence
render action: 'edit'
end
end

View file

@ -5,6 +5,8 @@ class Track < ActiveRecord::Base
before_create :generate_guid
validates :name, presence: true
private
def generate_guid

View file

@ -1,9 +1,9 @@
.row
.col-md-12
.page-header
-if @sponsor.new_record?
New
%h1
-if @sponsor.new_record?
New
Sponsor
= @sponsor.name
.row
@ -16,4 +16,4 @@
= f.input :website_url
= f.input :sponsorship_level, collection: @conference.sponsorship_levels
%p.text-right
= f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }
= f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }