mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
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.
This commit is contained in:
parent
ede8f22971
commit
3df3a908ac
@ -384,13 +384,9 @@ email:
|
|||||||
email_in:
|
email_in:
|
||||||
default: false
|
default: false
|
||||||
client: true
|
client: true
|
||||||
email_in_address:
|
|
||||||
default: ''
|
|
||||||
type: email
|
|
||||||
email_in_min_trust:
|
email_in_min_trust:
|
||||||
default: 2
|
default: 2
|
||||||
enum: 'TrustLevelSetting'
|
enum: 'TrustLevelSetting'
|
||||||
email_in_category: -1
|
|
||||||
email_prefix: ''
|
email_prefix: ''
|
||||||
email_site_title: ''
|
email_site_title: ''
|
||||||
|
|
||||||
|
17
db/migrate/20140711193923_remove_email_in_address_setting.rb
Normal file
17
db/migrate/20140711193923_remove_email_in_address_setting.rb
Normal file
@ -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
|
Loading…
Reference in New Issue
Block a user