From 3df3a908ac8ba987e9f0a110101674c6ad21bf5f Mon Sep 17 00:00:00 2001 From: riking Date: Fri, 11 Jul 2014 13:01:01 -0700 Subject: [PATCH] Remove email_in_address and email_in_category site settings The functionality is entirely covered by per-category email in addresses, and the category being a number was confusing people. --- config/site_settings.yml | 4 ---- ...711193923_remove_email_in_address_setting.rb | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20140711193923_remove_email_in_address_setting.rb diff --git a/config/site_settings.yml b/config/site_settings.yml index fe7b5a0987d..a68035def3a 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -384,13 +384,9 @@ email: email_in: default: false client: true - email_in_address: - default: '' - type: email email_in_min_trust: default: 2 enum: 'TrustLevelSetting' - email_in_category: -1 email_prefix: '' email_site_title: '' diff --git a/db/migrate/20140711193923_remove_email_in_address_setting.rb b/db/migrate/20140711193923_remove_email_in_address_setting.rb new file mode 100644 index 00000000000..cc2f6b63119 --- /dev/null +++ b/db/migrate/20140711193923_remove_email_in_address_setting.rb @@ -0,0 +1,17 @@ +class RemoveEmailInAddressSetting < ActiveRecord::Migration + def up + cat_id_r = ActiveRecord::Base.exec_sql("SELECT value FROM site_settings WHERE name = 'email_in_category'").first + email_r = ActiveRecord::Base.exec_sql("SELECT value FROM site_settings WHERE name = 'email_in_address'").first + if cat_id_r && email_r + category_id = cat_id_r["value"].to_i + email = email_r["value"] + ActiveRecord::Base.exec_sql("UPDATE categories SET email_in = ? WHERE id = ?", email, category_id) + end + + ActiveRecord::Base.exec_sql("DELETE FROM site_settings WHERE name = 'email_in_category' OR name = 'email_in_address'") + end + + def down + # this change is backwards-compatible + end +end