gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #229 from differentreality/create_conf_indicator

Browse source 
remove readonly option for start_date and end_date of conference
This commit is contained in:
Artem Chernikov 2014-06-19 14:04:04 +02:00
commit 8803384d2f
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -67,9 +67,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

6
app/views/admin/conference/new.html.haml
View file

@ -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'}

4
spec/controllers/admin/conferences_controller_spec.rb
View file

@ -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