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

Merge c1db82f19a into 798998b73f

Browse source
This commit is contained in:
Arun Kumar 2016-07-08 06:37:55 +00:00 • committed by GitHub
commit dce9ffb298
4 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/models/event.rb
View file

@ -30,7 +30,6 @@ class Event < ActiveRecord::Base
validate :abstract_limit validate :abstract_limit
validate :before_end_of_conference, on: :create validate :before_end_of_conference, on: :create
validates :title, presence: true validates :title, presence: true
validates :abstract, presence: true
validates :event_type, presence: true validates :event_type, presence: true
validates :program, presence: true validates :program, presence: true
validates :max_attendees, numericality: { only_integer: true, greater_than_or_equal_to: 1, allow_nil: true } validates :max_attendees, numericality: { only_integer: true, greater_than_or_equal_to: 1, allow_nil: true }

2
app/views/proposal/_proposal_form.html.haml
View file

@ -34,7 +34,7 @@
= difficulty_level.description = difficulty_level.description
= f.input :abstract, input_html: { rows: 5 }, = f.input :abstract, input_html: { rows: 5 },
required: true, hint: link_to('Tips to improve your presentations', 'http://blog.hubspot.com/blog/tabid/6307/bid/5975/10-Rules-to-Instantly-Improve-Your-Presentations.aspx') hint: link_to('Tips to improve your presentations', 'http://blog.hubspot.com/blog/tabid/6307/bid/5975/10-Rules-to-Instantly-Improve-Your-Presentations.aspx')
%p %p
You have used You have used

4
app/views/proposal/new.html.haml
View file

@ -43,8 +43,8 @@
:javascript :javascript
$("##{@program.event_types.first.id}-help").collapse('show'); $("##{@program.event_types.first.id}-help").collapse('show');
= f.input :abstract, input_html: { rows: 5, required: true }, = f.input :abstract, input_html: { rows: 5},
required: true, hint: link_to('Tips to improve your presentations', 'http://blog.hubspot.com/blog/tabid/6307/bid/5975/10-Rules-to-Instantly-Improve-Your-Presentations.aspx') hint: link_to('Tips to improve your presentations', 'http://blog.hubspot.com/blog/tabid/6307/bid/5975/10-Rules-to-Instantly-Improve-Your-Presentations.aspx')
%p %p
You have used You have used

1
spec/models/event_spec.rb
View file

@ -20,7 +20,6 @@ describe Event do
end end
it { is_expected.to validate_presence_of(:title) } it { is_expected.to validate_presence_of(:title) }
it { is_expected.to validate_presence_of(:abstract) }
it { is_expected.to validate_presence_of(:program) } it { is_expected.to validate_presence_of(:program) }
it { is_expected.to validate_presence_of(:event_type) } it { is_expected.to validate_presence_of(:event_type) }