github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-30 02:36:15 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Unify way to reset Site.preloaded_category_custom_fields (#17384)

Browse Source
This commit is contained in:
Alan Guo Xiang Tan 2022-07-14 08:54:31 +08:00 committed by GitHub
parent 7b6cd44c32
commit ee89c68687
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/site.rb
View File

@ -5,7 +5,11 @@ class Site
include ActiveModel::Serialization
cattr_accessor :preloaded_category_custom_fields
self.preloaded_category_custom_fields = Set.new
def self.reset_preloaded_category_custom_fields
self.preloaded_category_custom_fields = Set.new
end
reset_preloaded_category_custom_fields
##
# Sometimes plugins need to have additional data or options available

2
spec/models/site_spec.rb
View File

@ -133,7 +133,7 @@ describe Site do
expect(categories.last[:custom_fields]["enable_marketplace"]).to eq('f')
ensure
Site.preloaded_category_custom_fields.clear
Site.reset_preloaded_category_custom_fields
end
it 'sets the can_edit field for categories correctly' do

2
spec/requests/api/site_spec.rb
View File

@ -34,7 +34,7 @@ describe 'site' do
let(:expected_request_schema) { expected_request_schema }
end
ensure
Site.preloaded_category_custom_fields = Set.new
Site.reset_preloaded_category_custom_fields
end
end
end

2
spec/serializers/site_serializer_spec.rb
View File

@ -25,7 +25,7 @@ describe SiteSerializer do
expect(c1[:custom_fields]["enable_marketplace"]).to eq("t")
ensure
Site.preloaded_category_custom_fields.clear
Site.reset_preloaded_category_custom_fields
end
it "includes category tags" do