IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 02:11:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Fix 3N+1 query in /admin/customize/themes (#14876)

Browse Source
This commit is contained in:
Jarek Radosz 2021-11-11 18:11:23 +01:00 committed by GitHub
parent 13fdc979a8
commit 61d14a7694
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/theme.rb
View File

@ -50,6 +50,7 @@ class Theme < ActiveRecord::Base
:locale_fields,
:user,
:color_scheme,
:theme_translation_overrides,
theme_fields: :upload
)
}

8
app/models/theme_field.rb
View File

@ -216,8 +216,12 @@ class ThemeField < ActiveRecord::Base
# this would reduce the size of the payload, without affecting functionality
data = {}
fallback_data.each { |hash| data.merge!(hash) }
overrides = theme.translation_override_hash.deep_symbolize_keys
data.deep_merge!(overrides) if with_overrides
if with_overrides
overrides = theme.translation_override_hash.deep_symbolize_keys
data.deep_merge!(overrides)
end
data
end