Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Remove intermediary arrays when creating hash maps from results (#9291)

Browse source
This commit is contained in:
Eugen Rochko 2018-11-16 15:02:18 +01:00 • committed by GitHub
parent 367ad21995
commit 8069fd636b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/lib/settings/scoped_settings.rb
View file

@ -31,7 +31,7 @@ module Settings
def all_as_records
vars = thing_scoped
records = vars.map { |r| [r.var, r] }.to_h
records = vars.each_with_object({}) { |r, h| h[r.var] = r }
Setting.default_settings.each do |key, default_value|
next if records.key?(key) || default_value.is_a?(Hash)
@ -65,7 +65,7 @@ module Settings
class << self
def default_settings
defaulting = DEFAULTING_TO_UNSCOPED.map { |k| [k, Setting[k]] }.to_h
defaulting = DEFAULTING_TO_UNSCOPED.each_with_object({}) { |k, h| h[k] = Setting[k] }
Setting.default_settings.merge!(defaulting)
end
end