diff --git a/app/controllers/admin/conference_controller.rb b/app/controllers/admin/conference_controller.rb index 50eff4e3..e2ad147e 100644 --- a/app/controllers/admin/conference_controller.rb +++ b/app/controllers/admin/conference_controller.rb @@ -65,9 +65,7 @@ class Admin::ConferenceController < ApplicationController redirect_to(admin_conference_path(id: @conference.short_title), notice: 'Conference was successfully created.') else - redirect_to(new_admin_conference_path, - alert: 'Creating the Conference failed.' \ - "#{@conference.errors.full_messages.join('. ')}.") + render action: 'new' end end diff --git a/app/views/admin/conference/new.html.haml b/app/views/admin/conference/new.html.haml index c0d714ec..7aa155f2 100644 --- a/app/views/admin/conference/new.html.haml +++ b/app/views/admin/conference/new.html.haml @@ -7,11 +7,11 @@ = f.input :short_title, hint: "A short and unique handle for your conference, using only lower-case letters, numbers and underscores. This will be used to identify your conference in URLs etc. Example: 'froscon2011'", input_html: { required: 'required' } = f.input :social_tag, hint: "The hashtag you'll use on Twitter and Google+. Don't include the '#' sign!'", - input_html: { required: 'required' } + input_html: { required: 'required' } = f.input :contact_email, hint: 'Contact email address for your conference. Will be used as reply-to address in emails sent out by the system.' = f.inputs 'Scheduling' do = f.input :timezone, as: :time_zone, hint: 'Please select in what time zone your conference will take place.' - = f.input :start_date, as: :string, input_html: { id: 'conference-start-datepicker', readonly: 'readonly', required: 'required' } - = f.input :end_date, as: :string, input_html: { id: 'conference-end-datepicker', readonly: 'readonly', required: 'required' } + = f.input :start_date, as: :string, input_html: { id: 'conference-start-datepicker', required: 'required' } + = f.input :end_date, as: :string, input_html: { id: 'conference-end-datepicker', required: 'required' } = f.actions do = f.action :submit, button_html: {class: 'btn btn-success pull-right'}