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

Revert "add is_keynote attribute to event_types"

Browse source 
This reverts commit 96253b1fe048e2052fc35e961c5afbf27d0ef740.

Conflicts:
	app/models/conference.rb
This commit is contained in:
Stella Rouzi 2014-12-08 16:11:38 +02:00
parent c787190571
commit c9615f1880
9 changed files with 11 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/admin/event_types_controller.rb
View file

@ -49,10 +49,7 @@ module Admin
private
def event_type_params
params.require(:event_type).permit(:title, :length,
:minimum_abstract_length,
:maximum_abstract_length,
:color, :is_keynote)
params[:event_type]
end
end
end

6
app/models/conference.rb
View file

@ -45,13 +45,11 @@ class Conference < ActiveRecord::Base
end
def keynotes
where(state: :confirmed).
select { |e| e.event_type.is_keynote == true}
where(state: :confirmed).select { |e| e.event_type.title == 'Keynote'}
end
def highlights
where(state: :confirmed).where(is_highlight: true).
select { |e| e.event_type.is_keynote != true} # No duplication, if event is a keynote
where(is_highlight: true)
end
end
has_many :event_users, through: :events

2
app/models/event_type.rb
View file

@ -1,6 +1,6 @@
class EventType < ActiveRecord::Base
attr_accessible :title, :length, :minimum_abstract_length, :maximum_abstract_length, :color,
:conference_id, :is_keynote
:conference_id
belongs_to :conference

3
app/views/admin/event_types/_form.html.haml
View file

@ -13,7 +13,6 @@
= f.input :length, :input_html => {:size => 3}
= f.input :minimum_abstract_length, :input_html => {:size => 3}
= f.input :maximum_abstract_length, :input_html => {:size => 3}
= f.input :is_keynote
= f.input :color, :input_html => { :size => 6, :type => 'color' }
%p.text-right
= f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }
= f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }

2
app/views/admin/event_types/index.html.haml
View file

@ -11,7 +11,6 @@
%th Title
%th Length
%th Abstract Length
%th Keynote
%th Color
%th Actions
%tbody
@ -25,7 +24,6 @@
%td
= "#{event_type.minimum_abstract_length} - #{event_type.maximum_abstract_length}"
Words
%td= event_type.is_keynote
%td
%span.label{style: "background-color: #{event_type.color};"}
= event_type.color

2
app/views/admin/events/edit.html.haml
View file

@ -1 +1 @@
= render 'proposal/form'
= render 'proposal/form'

6
app/views/conference/_program.html.haml
View file

@ -24,19 +24,19 @@
= link_to(conference_schedule_path(@conference.short_title), class: 'btn btn-default btn-lg') do
Full Schedule
%h3.text-center
Don't miss out!
%br
- if @conference.events.highlights.any?
.row
.col-md-12
- @conference.events.highlights.each_slice(3) do |slice|
- @conference.events.highlights.each_slice(2) do |slice|
.row.row-centered
- slice.each do |event|
.col-md-4.col-centered.col-top.highlights
.col-md-6.col-centered.col-top.highlights
%p.text-center
%b= event.title
by #{event.speakers.first.name}
%h5.text-center
= simple_format truncate(event.abstract, length: 500, separator: ' ')
= link_to "Read More", conference_proposal_path(@conference.short_title, event)

5
db/migrate/20141207115535_add_is_keynote_to_event_types.rb
View file

@ -1,5 +0,0 @@
class AddIsKeynoteToEventTypes < ActiveRecord::Migration
def change
add_column :event_types, :is_keynote, :boolean, default: false
end
end

5
db/schema.rb
View file

@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20141207115535) do
ActiveRecord::Schema.define(version: 20141130182139) do
create_table "ahoy_events", force: true do |t|
t.uuid "visit_id"
@ -191,12 +191,11 @@ ActiveRecord::Schema.define(version: 20141207115535) do
create_table "event_types", force: true do |t|
t.integer "conference_id"
t.string "title", null: false
t.string "title", null: false
t.integer "length", default: 30
t.integer "minimum_abstract_length", default: 0
t.integer "maximum_abstract_length", default: 500
t.string "color"
t.boolean "is_keynote", default: false
end
create_table "event_users", force: true do |t|