From 8b45c2a281c95cfe75dcf28f8c70cf59285a2c49 Mon Sep 17 00:00:00 2001
From: Stella Rouzi <differentreality@gmail.com>
Date: Mon, 8 Dec 2014 16:28:09 +0200
Subject: [PATCH] remove keynotes

---
 app/controllers/proposal_controller.rb      | 10 ----------
 app/models/conference.rb                    |  8 --------
 app/views/proposal/_proposal_form.html.haml |  2 +-
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/app/controllers/proposal_controller.rb b/app/controllers/proposal_controller.rb
index a0659071..5956f24f 100644
--- a/app/controllers/proposal_controller.rb
+++ b/app/controllers/proposal_controller.rb
@@ -39,16 +39,6 @@ class ProposalController < ApplicationController
     @event.event_users.new(user: current_user,
                            event_role: 'speaker')
 
-    type_id = params[:event][:event_type_id].to_f
-    keynote_ids = EventType.where(title: 'Keynote').pluck(:id)
-
-    if keynote_ids.include? type_id
-      @event.errors.add(:event_type_id, 'You are not allowed to create a Keynote!')
-      flash[:error] = "Could not submit proposal: #{@event.errors.full_messages.join(', ')}"
-      render action: 'new'
-      return
-    end
-
     if !@event.save
       flash[:error] = "Could not submit proposal: #{@event.errors.full_messages.join(', ')}"
       render action: 'new'
diff --git a/app/models/conference.rb b/app/models/conference.rb
index 2c61a35f..ff8d11af 100644
--- a/app/models/conference.rb
+++ b/app/models/conference.rb
@@ -44,10 +44,6 @@ class Conference < ActiveRecord::Base
       where(state: :confirmed)
     end
 
-    def keynotes
-      where(state: :confirmed).select { |e| e.event_type.title == 'Keynote'}
-    end
-
     def highlights
       where(is_highlight: true)
     end
@@ -898,10 +894,6 @@ class Conference < ActiveRecord::Base
     event_types << EventType.create(title: 'Workshop', length: 60, color: '#0000FF',
                                     minimum_abstract_length: 0,
                                     maximum_abstract_length: 500)
-    event_types << EventType.create(title: 'Keynote', length: 60, color: '#00FF00',
-                                    minimum_abstract_length: 0,
-                                    maximum_abstract_length: 500,
-                                    is_keynote: true)
     true
   end
 
diff --git a/app/views/proposal/_proposal_form.html.haml b/app/views/proposal/_proposal_form.html.haml
index f6ed5bb1..6ad68fa2 100644
--- a/app/views/proposal/_proposal_form.html.haml
+++ b/app/views/proposal/_proposal_form.html.haml
@@ -11,7 +11,7 @@
   %section#details
     - if can? :update, @event or can? :create, @event
       = f.input :event_type_id, as: :select,
-      collection: @conference.event_types.reject { |type| type.title == 'Keynote'}.map {|type| ["#{type.title} - #{show_time(type.length)}", type.id,
+      collection: @conference.event_types.map {|type| ["#{type.title} - #{show_time(type.length)}", type.id,
       data: { min_words: type.minimum_abstract_length, max_words: type.maximum_abstract_length }]},
       include_blank: false, label: 'Session Type'
     - else