Merge branch 'master' of https://github.com/bikebike/BikeBike

Conflicts:
	Gemfile
	Gemfile.lock

app/models/conference.rb

@@ -10,6 +10,8 @@ class Conference < ActiveRecord::Base
 	has_many :conference_registration_form_fields, :order => 'position ASC', :dependent => :destroy#, :class_name => '::ConferenceRegistrationFormField'
 	has_many :registration_form_fields, :through => :conference_registration_form_fields
 
+	has_many :workshops
+
 	accepts_nested_attributes_for :conference_host_organizations, :reject_if => proc {|u| u[:organization_id].blank?}, :allow_destroy => true
 
 	def to_param

app/models/event.rb

@@ -0,0 +1,2 @@
+class Event < ActiveRecord::Base
+end

app/models/event_type.rb

@@ -0,0 +1,2 @@
+class EventType < ActiveRecord::Base
+end

app/models/registration_form_field.rb

@@ -56,6 +56,14 @@ class RegistrationFormField < ActiveRecord::Base
 		o
 	end
 
+	def repeats?()
+		field_type.to_s == 'multiple' && selection_type.to_s != 'select'
+	end
+
+	def is_array?()
+		field_type.to_s == 'multiple' && selection_type.to_s != 'radio_button'
+	end
+
 	private
 		def get_from_options(key)
 			if options

app/models/workshop.rb

@@ -0,0 +1,7 @@
+class Workshop < ActiveRecord::Base
+    belongs_to :conference
+
+    def to_param
+        slug
+    end
+end

app/models/workshop_facilitator.rb

@@ -0,0 +1,2 @@
+class WorkshopFacilitator < ActiveRecord::Base
+end

app/models/workshop_requested_resource.rb

@@ -0,0 +1,2 @@
+class WorkshopRequestedResource < ActiveRecord::Base
+end