From f5c5e6a44b955f5b866a8eba4005f71cfb7e8c90 Mon Sep 17 00:00:00 2001 From: Gopesh Tulsyan Date: Sat, 14 Jun 2014 18:33:39 +0530 Subject: [PATCH] Adds photo to venue --- app/models/venue.rb | 7 ++++++- app/views/admin/venue/venue_info.html.haml | 3 +++ db/migrate/20140613083115_add_photo_to_venue.rb | 8 ++++++++ db/schema.rb | 6 +++++- spec/factories/conferences.rb | 1 + spec/factories/venues.rb | 1 + 6 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20140613083115_add_photo_to_venue.rb diff --git a/app/models/venue.rb b/app/models/venue.rb index 272c9897..c63cb69b 100644 --- a/app/models/venue.rb +++ b/app/models/venue.rb @@ -1,8 +1,13 @@ class Venue < ActiveRecord::Base - attr_accessible :name, :description, :address, :website + attr_accessible :name, :description, :website, :address, :photo has_many :conferences 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 } private def generate_guid diff --git a/app/views/admin/venue/venue_info.html.haml b/app/views/admin/venue/venue_info.html.haml index af339af2..c576612c 100644 --- a/app/views/admin/venue/venue_info.html.haml +++ b/app/views/admin/venue/venue_info.html.haml @@ -5,4 +5,7 @@ = f.input :address, :input_html => {:rows => 1} = f.input :website = f.input :description, :input_html => { :rows => 10, :cols => 20 } + - if !@venue.photo.blank? + = image_tag @venue.photo(:thumb) + = f.input :photo = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"} diff --git a/db/migrate/20140613083115_add_photo_to_venue.rb b/db/migrate/20140613083115_add_photo_to_venue.rb new file mode 100644 index 00000000..c2d0454c --- /dev/null +++ b/db/migrate/20140613083115_add_photo_to_venue.rb @@ -0,0 +1,8 @@ +class AddPhotoToVenue < ActiveRecord::Migration + def change + add_column :venues, :photo_file_name, :string + add_column :venues, :photo_content_type, :string + add_column :venues, :photo_file_size, :integer + add_column :venues, :photo_updated_at, :datetime + end +end diff --git a/db/schema.rb b/db/schema.rb index 2d6eeb12..6d9c6744 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: 20140612181230) do +ActiveRecord::Schema.define(version: 20140613083115) do create_table "answers", force: true do |t| t.string "title" @@ -390,6 +390,10 @@ ActiveRecord::Schema.define(version: 20140612181230) do t.string "offline_map_bounds" t.datetime "created_at" t.datetime "updated_at" + t.string "photo_file_name" + t.string "photo_content_type" + t.integer "photo_file_size" + t.datetime "photo_updated_at" end create_table "versions", force: true do |t| diff --git a/spec/factories/conferences.rb b/spec/factories/conferences.rb index 8fdbe34d..47596648 100644 --- a/spec/factories/conferences.rb +++ b/spec/factories/conferences.rb @@ -9,5 +9,6 @@ FactoryGirl.define do contact_email 'admin@example.com' start_date Date.today end_date Date.tomorrow + venue end end diff --git a/spec/factories/venues.rb b/spec/factories/venues.rb index fca4e1f5..69eb863b 100644 --- a/spec/factories/venues.rb +++ b/spec/factories/venues.rb @@ -4,5 +4,6 @@ FactoryGirl.define do name 'Suse Office' address 'Maxfeldstrasse 5 \n90409 Nuremberg' website 'www.opensuse.org' + description 'Lorem Ipsum Dolor' end end