diff --git a/app/controllers/admin/conference_controller.rb b/app/controllers/admin/conference_controller.rb index def55090..6cdd4c49 100644 --- a/app/controllers/admin/conference_controller.rb +++ b/app/controllers/admin/conference_controller.rb @@ -185,7 +185,7 @@ module Admin :use_difficulty_levels, :use_vpositions, :use_vdays, :vdays_attributes, :vpositions_attributes, :use_volunteers, :color, :sponsorship_levels_attributes, :sponsors_attributes, - :photos_attributes, :targets, :targets_attributes, + :targets, :targets_attributes, :campaigns, :campaigns_attributes, :registration_limit) end end diff --git a/app/controllers/conference_controller.rb b/app/controllers/conference_controller.rb index 16aa382f..eecaf71d 100644 --- a/app/controllers/conference_controller.rb +++ b/app/controllers/conference_controller.rb @@ -23,11 +23,6 @@ class ConferenceController < ApplicationController end end - def gallery_photos - @photos = @conference.photos - render 'photos', formats: [:js] - end - private def respond_to_options diff --git a/app/models/conference.rb b/app/models/conference.rb index 0a2ff5d6..3fbd0a90 100644 --- a/app/models/conference.rb +++ b/app/models/conference.rb @@ -30,7 +30,6 @@ class Conference < ActiveRecord::Base has_many :vpositions, dependent: :destroy has_many :sponsorship_levels, -> { order('position ASC') }, dependent: :destroy has_many :sponsors, dependent: :destroy - has_many :photos, dependent: :destroy has_many :targets, dependent: :destroy has_many :campaigns, dependent: :destroy has_many :commercials, as: :commercialable, dependent: :destroy @@ -44,7 +43,6 @@ class Conference < ActiveRecord::Base accepts_nested_attributes_for :questions, allow_destroy: true accepts_nested_attributes_for :vdays, allow_destroy: true accepts_nested_attributes_for :vpositions, allow_destroy: true - accepts_nested_attributes_for :photos, allow_destroy: true accepts_nested_attributes_for :targets, allow_destroy: true accepts_nested_attributes_for :campaigns, allow_destroy: true diff --git a/app/models/photo.rb b/app/models/photo.rb deleted file mode 100644 index 91ab1dea..00000000 --- a/app/models/photo.rb +++ /dev/null @@ -1,10 +0,0 @@ -class Photo < ActiveRecord::Base - belongs_to :conference - validates_presence_of :picture - has_attached_file :picture, - styles: { thumb: '100x100>', large: '300x300>', banner: '600x300>' } - - validates_attachment_content_type :picture, - content_type: [/jpg/, /jpeg/, /png/, /gif/], - size: { in: 0..500.kilobytes } -end diff --git a/app/views/conference/_gallery_photo.html.haml b/app/views/conference/_gallery_photo.html.haml deleted file mode 100644 index db013bd3..00000000 --- a/app/views/conference/_gallery_photo.html.haml +++ /dev/null @@ -1,7 +0,0 @@ -- photos.each_with_index do |photo,index| - %div.item{ class: (index==0? 'active' : '') } - = image_tag(photo.picture(:banner)) - - unless photo.description.blank? - %div.carousel-caption - .lead - = photo.description diff --git a/db/migrate/20160427101444_remove_photos.rb b/db/migrate/20160427101444_remove_photos.rb new file mode 100644 index 00000000..966cf187 --- /dev/null +++ b/db/migrate/20160427101444_remove_photos.rb @@ -0,0 +1,13 @@ +class RemovePhotos < ActiveRecord::Migration + def change + drop_table :photos do |t| + t.text :description + t.string :picture_file_name + t.string :picture_content_type + t.integer :picture_file_size + t.datetime :picture_updated_at + t.belongs_to :conference + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 97d13714..3258f8e2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160403214841) do +ActiveRecord::Schema.define(version: 20160427101444) do create_table "ahoy_events", force: :cascade do |t| t.uuid "visit_id", limit: 16 @@ -257,17 +257,6 @@ ActiveRecord::Schema.define(version: 20160403214841) do t.datetime "updated_at" end - create_table "photos", force: :cascade do |t| - t.text "description" - t.string "picture_file_name" - t.string "picture_content_type" - t.integer "picture_file_size" - t.datetime "picture_updated_at" - t.integer "conference_id" - t.datetime "created_at" - t.datetime "updated_at" - end - create_table "programs", force: :cascade do |t| t.integer "conference_id" t.integer "rating", default: 0