github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 03:41:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Resetting selectable avatars was failing (#16302)

Browse Source
This commit is contained in:
Penar Musaraj
2022-03-28 14:15:28 -04:00
committed by GitHub
parent 2b974d4992
commit b1211bee97
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/site_setting_extension.rb
View File

@ -508,6 +508,8 @@ module SiteSettingExtension
value = current[name] value = current[name]
end end
return [] if value.empty?
value = value.split("|").map(&:to_i) value = value.split("|").map(&:to_i)
uploads_list = Upload.where(id: value).to_a uploads_list = Upload.where(id: value).to_a
uploads[name] = uploads_list if uploads_list uploads[name] = uploads_list if uploads_list

9
spec/lib/site_setting_extension_spec.rb
View File

@ -254,8 +254,11 @@ describe SiteSettingExtension do
end end
describe "remove_override" do describe "remove_override" do
fab!(:upload) { Fabricate(:upload) }
before do before do
settings.setting(:test_override, "test") settings.setting(:test_override, "test")
settings.setting(:image_list_test, "", type: :uploaded_image_list)
settings.refresh! settings.refresh!
end end
it "correctly nukes overrides" do it "correctly nukes overrides" do
@ -263,6 +266,12 @@ describe SiteSettingExtension do
settings.remove_override!(:test_override) settings.remove_override!(:test_override)
expect(settings.test_override).to eq("test") expect(settings.test_override).to eq("test")
end end
it "correctly nukes overrides for image list type setting" do
settings.image_list_test = "#{upload.id}"
settings.remove_override!(:image_list_test)
expect(settings.image_list_test).to be_empty
end
end end
describe "string setting" do describe "string setting" do