Merge c1063645da into 17427c88fe

app/models/conference.rb

@@ -10,7 +10,8 @@ class Conference < ActiveRecord::Base
                   :difficulty_levels_attributes, :use_difficulty_levels,
                   :use_vpositions, :use_vdays, :vdays_attributes, :vpositions_attributes, :use_volunteers,
                   :media_id, :media_type, :color, :description,
-                  :registration_description, :ticket_description
+                  :registration_description, :ticket_description,
+                  :lodging_description
 
   has_paper_trail
 

app/models/lodging.rb

@@ -0,0 +1,10 @@
+class Lodging < ActiveRecord::Base
+  attr_accessible :name, :description, :photo, :website_link
+  belongs_to :venue
+  has_attached_file :photo,
+                    styles: { thumb: '100x100>', large: '300x300>' }
+
+  validates_attachment_content_type :photo,
+                                    content_type: [/jpg/, /jpeg/, /png/, /gif/],
+                                    size: { in: 0..500.kilobytes }
+end

app/models/venue.rb

@@ -1,7 +1,16 @@
 class Venue < ActiveRecord::Base
+  attr_accessible :name, :description, :website, :address, :photo, :lodgings_attributes
   has_many :conferences
+  has_many :lodgings
   before_create :generate_guid
+  has_attached_file :photo,
+                    styles: { thumb: '100x100>', large: '300x300>' }
 
+  validates_attachment_content_type :photo,
+                                    content_type: [/jpg/, /jpeg/, /png/, /gif/],
+                                    size: { in: 0..500.kilobytes }
+  accepts_nested_attributes_for :lodgings, reject_if: proc { |r| r['name'].blank? },
+                                           allow_destroy: true
   private
 
   def generate_guid