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

Create default event_types. More event validations. Fixes #319

Browse source
This commit is contained in:
Henne Vogelsang 2014-07-16 00:01:40 +02:00
parent a76fa8dd59
commit 064e0a3fd7
3 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/models/event.rb
View file

@ -33,7 +33,8 @@ class Event < ActiveRecord::Base
validate :biography_exists
validates :title, presence: true
validates :abstract, presence: true
validates :media_type, allow_nil: true, inclusion: { in: Conference.media_types.values }
validates :event_type, presence: true
validates :media_type, inclusion: { in: Conference.media_types.values }, allow_blank: true
scope :confirmed, -> { where(state: 'confirmed') }
@ -181,15 +182,14 @@ class Event < ActiveRecord::Base
private
def abstract_limit
# If we don't have an event type, there is no need to count anything
return unless event_type
len = abstract.split.size
max = event_type.maximum_abstract_length
min = event_type.minimum_abstract_length
max_words = event_type.maximum_abstract_length
min_words = event_type.minimum_abstract_length
if len < min
errors.add(:abstract, "cannot have less than #{min} words")
end
errors.add(:abstract, "cannot have more than #{max} words") if len > max
errors.add(:abstract, "cannot have less than #{min_words} words") if len < min_words
errors.add(:abstract, "cannot have more than #{max_words} words") if len > max_words
end
def biography_exists