From de1ed9be2b1311ab010348e0212eb3b54ba7105f Mon Sep 17 00:00:00 2001 From: Stella Date: Sat, 28 Dec 2013 15:29:50 +0200 Subject: [PATCH] Fixes for voting on proposals. 0 for no voting option. Set default value in migration to avoid blank/null problems. --- app/models/call_for_papers.rb | 2 +- app/views/admin/callforpapers/show.html.haml | 2 +- ...1228132353_change_default_rating_in_call_for_papers.rb | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20131228132353_change_default_rating_in_call_for_papers.rb diff --git a/app/models/call_for_papers.rb b/app/models/call_for_papers.rb index f3915b75..879cf2fe 100644 --- a/app/models/call_for_papers.rb +++ b/app/models/call_for_papers.rb @@ -3,6 +3,6 @@ class CallForPapers < ActiveRecord::Base belongs_to :conference validates_presence_of :start_date, :end_date, :hard_deadline - validates :rating, :numericality => { :greater_than_or_equal_to => 1, :less_than_or_equal_to => 10 } + validates :rating, :numericality => { :greater_than_or_equal_to => 0, :less_than_or_equal_to => 10 } end diff --git a/app/views/admin/callforpapers/show.html.haml b/app/views/admin/callforpapers/show.html.haml index 6757dff7..f342534e 100644 --- a/app/views/admin/callforpapers/show.html.haml +++ b/app/views/admin/callforpapers/show.html.haml @@ -9,6 +9,6 @@ = f.input :hard_deadline, :as => :string, :input_html => { :id => "cfp-hard-datepicker", :readonly => "readonly" } = f.input :description, :hint => "Welcome text for the Call for Papers" = f.input :schedule_changes - = f.input :rating, :hint => "Enter the number of different rating levels you want to have for voting on proposals." + = f.input :rating, :hint => "Enter the number of different rating levels you want to have for voting on proposals. Enter 0 if you do not want to vote on proposals." = f.input :rating_desc, :label => "Rating Description", :hint => "Enter comments about voting process.", :input_html => {:value => "1 is for 'I don't like this proposal',\n2 is for 'I am ok with this proposal.',\n3 is for 'I love this proposal!'", :rows => 5, :class => "span6"} = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"} diff --git a/db/migrate/20131228132353_change_default_rating_in_call_for_papers.rb b/db/migrate/20131228132353_change_default_rating_in_call_for_papers.rb new file mode 100644 index 00000000..adaaac75 --- /dev/null +++ b/db/migrate/20131228132353_change_default_rating_in_call_for_papers.rb @@ -0,0 +1,8 @@ +class ChangeDefaultRatingInCallForPapers < ActiveRecord::Migration + def up + change_column :call_for_papers, :rating, :integer, :default => 3 + end + + def down + end +end