From 4d2f0e21115f961e5d788b211cfd493b93b60708 Mon Sep 17 00:00:00 2001 From: differentreality Date: Fri, 16 Aug 2013 16:09:29 +0300 Subject: [PATCH] fix rebase conflict --- app/models/call_for_papers.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/call_for_papers.rb b/app/models/call_for_papers.rb index 6dcef8d7..17dd74e8 100644 --- a/app/models/call_for_papers.rb +++ b/app/models/call_for_papers.rb @@ -1,7 +1,8 @@ class CallForPapers < ActiveRecord::Base - attr_accessible :start_date, :end_date, :hard_deadline, :description, :schedule_changes + attr_accessible :start_date, :end_date, :hard_deadline, :description, :schedule_changes, :rating, :rating_desc belongs_to :conference validates_presence_of :start_date, :end_date, :hard_deadline + validates :rating, :numericality => { :greater_than_or_equal_to => 2, :less_than_or_equal_to => 10 } -end \ No newline at end of file +end