github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-25 04:45:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Deprecated settings should not override from UI (#18536)

Browse Source 
Unless we have specified `override = true` in the DeprecatedSettings
class for an old -> new settings map, we should not allow people
to change the old setting in the UI and have it affect the new
setting.
This commit is contained in:
Martin Brennan 2022-10-11 11:14:13 +10:00 committed by GitHub
parent a7bdd0a58e
commit b6854c2f88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/admin/site_settings_controller.rb
View File

@ -18,8 +18,13 @@ class Admin::SiteSettingsController < Admin::AdminController
value = params[id] value = params[id]
value.strip! if value.is_a?(String) value.strip! if value.is_a?(String)
new_setting_name = SiteSettings::DeprecatedSettings::SETTINGS.find do |old_name, new_name, _, _| new_setting_name = SiteSettings::DeprecatedSettings::SETTINGS.find do |old_name, new_name, override, _|
break new_name if old_name == id if old_name == id
if !override
raise Discourse::InvalidParameters, "You cannot change this site setting because it is deprecated, use #{new_name} instead."
end
break new_name
end
end end
id = new_setting_name if new_setting_name id = new_setting_name if new_setting_name

10
spec/requests/admin/site_settings_controller_spec.rb
View File

@ -52,6 +52,16 @@ RSpec.describe Admin::SiteSettingsController do
expect(SiteSetting.search_tokenize_chinese).to eq(true) expect(SiteSetting.search_tokenize_chinese).to eq(true)
end end
it 'throws an error when trying to change a deprecated setting with override = false' do
SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:trust_level_4]
put "/admin/site_settings/enable_personal_messages.json", params: {
enable_personal_messages: false
}
expect(response.status).to eq(422)
expect(SiteSetting.personal_message_enabled_groups).to eq(Group::AUTO_GROUPS[:trust_level_4])
end
it 'allows value to be a blank string' do it 'allows value to be a blank string' do
put "/admin/site_settings/test_setting.json", params: { put "/admin/site_settings/test_setting.json", params: {
test_setting: '' test_setting: ''