diff --git a/app/models/conference.rb b/app/models/conference.rb index 40e3e181..20825c16 100644 --- a/app/models/conference.rb +++ b/app/models/conference.rb @@ -20,7 +20,7 @@ class Conference < ActiveRecord::Base :include_social_media_in_splash, :include_program_in_splash, :make_conference_public, :photos_attributes, :banner_photo, :include_banner_in_splash, :targets, :targets_attributes, :campaigns, - :campaigns_attributes + :campaigns_attributes, :instagram_url has_paper_trail diff --git a/app/views/admin/conference/edit.html.haml b/app/views/admin/conference/edit.html.haml index 0b6c043f..7a57ce82 100644 --- a/app/views/admin/conference/edit.html.haml +++ b/app/views/admin/conference/edit.html.haml @@ -46,4 +46,5 @@ = f.input :facebook_url, hint: 'This will appear in the social media section as link to the Facebook page of your Conference' = f.input :google_url, label: 'Google+ Url', hint: 'This will appear in the social media section as the link to the Google+ Page of your Conference' = f.input :twitter_url, hint: 'This will appear in the social media section as the link to the Twitter Page of your Conference' + = f.input :instagram_url, hint: 'This will appear in the social media section as the link to the Instagram Page of your Conference' = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"} diff --git a/db/migrate/20140627165718_add_instagram_url_to_conference.rb b/db/migrate/20140627165718_add_instagram_url_to_conference.rb new file mode 100644 index 00000000..d405bbc4 --- /dev/null +++ b/db/migrate/20140627165718_add_instagram_url_to_conference.rb @@ -0,0 +1,5 @@ +class AddInstagramUrlToConference < ActiveRecord::Migration + def change + add_column :conferences, :instagram_url, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index b52e553c..a58e424c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -125,6 +125,7 @@ ActiveRecord::Schema.define(version: 20140626123837) do t.integer "banner_photo_file_size" t.datetime "banner_photo_updated_at" t.boolean "include_banner_in_splash", default: false + t.string "instagram_url" end create_table "conferences_questions", id: false, force: true do |t|