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

Merge pull request #1281 from sheamunion/issue-1273

Browse source 
Better "short title" UI. Fixes #1273
This commit is contained in:
Hernán Schmidt 2017-02-08 19:38:25 +01:00 • committed by GitHub
commit bee4dc9038
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/conference.rb
View file

@ -56,7 +56,7 @@ class Conference < ActiveRecord::Base
:end_date :end_date
validates_uniqueness_of :short_title validates_uniqueness_of :short_title
validates_format_of :short_title, with: /\A[a-zA-Z0-9_-]*\z/ validates_format_of :short_title, with: /\A[a-z0-9_]*\z/
validates :registration_limit, numericality: { only_integer: true, greater_than_or_equal_to: 0 } validates :registration_limit, numericality: { only_integer: true, greater_than_or_equal_to: 0 }
# This validation is needed since a conference with a start date greater than the end date is not possible # This validation is needed since a conference with a start date greater than the end date is not possible

2
app/views/admin/conferences/new.html.haml
View file

@ -5,7 +5,7 @@
= f.input :title, hint: "The name of your conference as it shall appear throughout the site. Example: 'OpenSUSE Conference 2013'", = f.input :title, hint: "The name of your conference as it shall appear throughout the site. Example: 'OpenSUSE Conference 2013'",
input_html: { required: 'required' } input_html: { required: 'required' }
= 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'", = 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' } input_html: { required: 'required', pattern: '[a-z0-9_]+', title: 'Only lower-case letters, numbers and underscores.' }, :prepend => conferences_url + '/'
= f.inputs 'Scheduling' do = f.inputs 'Scheduling' do
= f.input :timezone, as: :time_zone, default: Time.zone.name, hint: 'Please select in what time zone your conference will take place.' = f.input :timezone, as: :time_zone, default: Time.zone.name, hint: 'Please select in what time zone your conference will take place.'
= f.input :start_date, as: :string, input_html: { id: 'conference-start-datepicker', required: 'required' } = f.input :start_date, as: :string, input_html: { id: 'conference-start-datepicker', required: 'required' }