From 11bf53442c270f71f4e54fe13fc829494958bb21 Mon Sep 17 00:00:00 2001 From: raluka Date: Thu, 17 Sep 2015 12:12:51 +0200 Subject: [PATCH 1/4] Grooming code to fix rubocop offenses --- app/models/conference.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/models/conference.rb b/app/models/conference.rb index 94e23149..3c6f20b2 100644 --- a/app/models/conference.rb +++ b/app/models/conference.rb @@ -114,17 +114,17 @@ class Conference < ActiveRecord::Base before_create :add_color def date_range_string - startstr = "Unknown - " - endstr = "Unknown" + startstr = 'Unknown - ' + endstr = 'Unknown' if start_date.month == end_date.month && start_date.year == end_date.year - startstr = start_date.strftime("%B %d - ") - endstr = end_date.strftime("%d, %Y") + startstr = start_date.strftime('%B %d - ') + endstr = end_date.strftime('%d, %Y') elsif start_date.month != end_date.month && start_date.year == end_date.year - startstr = start_date.strftime("%B %d - ") - endstr = end_date.strftime("%B %d, %Y") + startstr = start_date.strftime('%B %d - ') + endstr = end_date.strftime('%B %d, %Y') else - startstr = start_date.strftime("%B %d, %Y - ") - endstr = end_date.strftime("%B %d, %Y") + startstr = start_date.strftime('%B %d, %Y - ') + endstr = end_date.strftime('%B %d, %Y') end result = startstr + endstr From fd709ed4c09d357b4e78b14f03ec6a641c730781 Mon Sep 17 00:00:00 2001 From: raluka Date: Tue, 29 Sep 2015 16:40:51 +0200 Subject: [PATCH 2/4] Issue #686: Postalcode requires number --- .../20150929142405_change_postalcode_format_in_venues.rb | 9 +++++++++ db/schema.rb | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20150929142405_change_postalcode_format_in_venues.rb diff --git a/db/migrate/20150929142405_change_postalcode_format_in_venues.rb b/db/migrate/20150929142405_change_postalcode_format_in_venues.rb new file mode 100644 index 00000000..1cfbc714 --- /dev/null +++ b/db/migrate/20150929142405_change_postalcode_format_in_venues.rb @@ -0,0 +1,9 @@ +class ChangePostalcodeFormatInVenues < ActiveRecord::Migration + def up + change_column :venues, :postalcode, :string + end + + def down + change_column :venues, :postalcode, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 086a703f..0426bdbf 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: 20150415121038) do +ActiveRecord::Schema.define(version: 20150929142405) do create_table "ahoy_events", force: true do |t| t.uuid "visit_id" @@ -515,7 +515,7 @@ ActiveRecord::Schema.define(version: 20150415121038) do t.integer "photo_file_size" t.datetime "photo_updated_at" t.string "street" - t.integer "postalcode" + t.string "postalcode" t.string "city" t.string "country" t.string "latitude" From e3fa414a5c4b81ca2cd5ecbafa800b6fe8ea38bc Mon Sep 17 00:00:00 2001 From: raluka Date: Mon, 12 Oct 2015 11:58:16 +0200 Subject: [PATCH 3/4] made migration irreversible --- ...2405_change_postalcode_format_in_venues.rb | 6 +--- db/schema.rb | 36 +++++++++---------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/db/migrate/20150929142405_change_postalcode_format_in_venues.rb b/db/migrate/20150929142405_change_postalcode_format_in_venues.rb index 1cfbc714..1f9351d6 100644 --- a/db/migrate/20150929142405_change_postalcode_format_in_venues.rb +++ b/db/migrate/20150929142405_change_postalcode_format_in_venues.rb @@ -1,9 +1,5 @@ class ChangePostalcodeFormatInVenues < ActiveRecord::Migration - def up + def change change_column :venues, :postalcode, :string end - - def down - change_column :venues, :postalcode, :integer - end end diff --git a/db/schema.rb b/db/schema.rb index 0426bdbf..6ba080c3 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -158,35 +158,35 @@ ActiveRecord::Schema.define(version: 20150929142405) do create_table "email_settings", force: true do |t| t.integer "conference_id" - t.boolean "send_on_registration", default: false - t.boolean "send_on_accepted", default: false - t.boolean "send_on_rejected", default: false - t.boolean "send_on_confirmed_without_registration", default: false - t.text "registration_email_template" - t.text "accepted_email_template" - t.text "rejected_email_template" - t.text "confirmed_email_template" + t.boolean "send_on_registration", default: false + t.boolean "send_on_accepted", default: false + t.boolean "send_on_rejected", default: false + t.boolean "send_on_confirmed_without_registration", default: false + t.text "registration_body" + t.text "accepted_body" + t.text "rejected_body" + t.text "confirmed_without_registration_body" t.datetime "created_at" t.datetime "updated_at" t.string "registration_subject" t.string "accepted_subject" t.string "rejected_subject" t.string "confirmed_without_registration_subject" - t.boolean "send_on_updated_conference_dates", default: false + t.boolean "send_on_updated_conference_dates", default: false t.string "updated_conference_dates_subject" - t.text "updated_conference_dates_template" - t.boolean "send_on_updated_conference_registration_dates", default: false + t.text "updated_conference_dates_body" + t.boolean "send_on_updated_conference_registration_dates", default: false t.string "updated_conference_registration_dates_subject" - t.text "updated_conference_registration_dates_template" - t.boolean "send_on_venue_update", default: false + t.text "updated_conference_registration_dates_body" + t.boolean "send_on_venue_update", default: false t.string "venue_update_subject" - t.text "venue_update_template" - t.boolean "send_on_call_for_papers_dates_updates", default: false - t.boolean "send_on_call_for_papers_schedule_public", default: false + t.text "venue_update_body" + t.boolean "send_on_call_for_papers_dates_updates", default: false + t.boolean "send_on_call_for_papers_schedule_public", default: false t.string "call_for_papers_schedule_public_subject" t.string "call_for_papers_dates_updates_subject" - t.text "call_for_papers_schedule_public_template" - t.text "call_for_papers_dates_updates_template" + t.text "call_for_papers_schedule_public_body" + t.text "call_for_papers_dates_updates_body" end create_table "event_types", force: true do |t| From 3d91029afcd35c2f3bab1f32d9018f0907ad2e8c Mon Sep 17 00:00:00 2001 From: raluka Date: Wed, 14 Oct 2015 11:53:48 +0200 Subject: [PATCH 4/4] now reverting migration will raise AR error --- ...2405_change_postalcode_format_in_venues.rb | 6 +++- db/schema.rb | 36 +++++++++---------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/db/migrate/20150929142405_change_postalcode_format_in_venues.rb b/db/migrate/20150929142405_change_postalcode_format_in_venues.rb index 1f9351d6..010f9349 100644 --- a/db/migrate/20150929142405_change_postalcode_format_in_venues.rb +++ b/db/migrate/20150929142405_change_postalcode_format_in_venues.rb @@ -1,5 +1,9 @@ class ChangePostalcodeFormatInVenues < ActiveRecord::Migration - def change + def up change_column :venues, :postalcode, :string end + + def down + raise ActiveRecord::IrreversibleMigration.new('Cannot reverse migration.') + end end diff --git a/db/schema.rb b/db/schema.rb index 6ba080c3..0426bdbf 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -158,35 +158,35 @@ ActiveRecord::Schema.define(version: 20150929142405) do create_table "email_settings", force: true do |t| t.integer "conference_id" - t.boolean "send_on_registration", default: false - t.boolean "send_on_accepted", default: false - t.boolean "send_on_rejected", default: false - t.boolean "send_on_confirmed_without_registration", default: false - t.text "registration_body" - t.text "accepted_body" - t.text "rejected_body" - t.text "confirmed_without_registration_body" + t.boolean "send_on_registration", default: false + t.boolean "send_on_accepted", default: false + t.boolean "send_on_rejected", default: false + t.boolean "send_on_confirmed_without_registration", default: false + t.text "registration_email_template" + t.text "accepted_email_template" + t.text "rejected_email_template" + t.text "confirmed_email_template" t.datetime "created_at" t.datetime "updated_at" t.string "registration_subject" t.string "accepted_subject" t.string "rejected_subject" t.string "confirmed_without_registration_subject" - t.boolean "send_on_updated_conference_dates", default: false + t.boolean "send_on_updated_conference_dates", default: false t.string "updated_conference_dates_subject" - t.text "updated_conference_dates_body" - t.boolean "send_on_updated_conference_registration_dates", default: false + t.text "updated_conference_dates_template" + t.boolean "send_on_updated_conference_registration_dates", default: false t.string "updated_conference_registration_dates_subject" - t.text "updated_conference_registration_dates_body" - t.boolean "send_on_venue_update", default: false + t.text "updated_conference_registration_dates_template" + t.boolean "send_on_venue_update", default: false t.string "venue_update_subject" - t.text "venue_update_body" - t.boolean "send_on_call_for_papers_dates_updates", default: false - t.boolean "send_on_call_for_papers_schedule_public", default: false + t.text "venue_update_template" + t.boolean "send_on_call_for_papers_dates_updates", default: false + t.boolean "send_on_call_for_papers_schedule_public", default: false t.string "call_for_papers_schedule_public_subject" t.string "call_for_papers_dates_updates_subject" - t.text "call_for_papers_schedule_public_body" - t.text "call_for_papers_dates_updates_body" + t.text "call_for_papers_schedule_public_template" + t.text "call_for_papers_dates_updates_template" end create_table "event_types", force: true do |t|