From 72a077e2608a6fe81c10050312336f245582e16a Mon Sep 17 00:00:00 2001 From: Stella Rouzi Date: Thu, 12 Jun 2014 21:16:08 +0300 Subject: [PATCH 1/2] remove readonly option for start_date and end_date of conference so that the on-screen indication of missing fields will work --- app/controllers/admin/conference_controller.rb | 4 +--- app/views/admin/conference/new.html.haml | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) 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'} From e86b71f1d54ef8dc6a5dce4af5b9fc2f87963e89 Mon Sep 17 00:00:00 2001 From: Stella Rouzi Date: Fri, 13 Jun 2014 16:27:51 +0300 Subject: [PATCH 2/2] change test for render instead of redirect --- spec/controllers/admin/conferences_controller_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/controllers/admin/conferences_controller_spec.rb b/spec/controllers/admin/conferences_controller_spec.rb index 7bd9a42e..961f6463 100644 --- a/spec/controllers/admin/conferences_controller_spec.rb +++ b/spec/controllers/admin/conferences_controller_spec.rb @@ -97,7 +97,7 @@ describe Admin::ConferenceController do it 're-renders the new template' do post :create, conference: attributes_for(:conference, short_title: nil) - expect(response).to redirect_to new_admin_conference_path + expect(response).to be_success end end @@ -114,7 +114,7 @@ describe Admin::ConferenceController do it 're-renders the new template' do conference post :create, conference: attributes_for(:conference, short_title: conference.short_title) - expect(response).to redirect_to new_admin_conference_path + expect(response).to be_success end end end