diff options
author | ThibG <thib@sitedethib.com> | 2018-08-26 13:23:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-26 13:23:52 +0200 |
commit | 2903f8f36b7c41b77de4ad6c8c5b0a6c0b2a7ace (patch) | |
tree | 4c8d12cc031476870a918bec3b3000f899101a32 /app/lib/settings | |
parent | 0ddf439999b05b5dfd6d5a5257327fa7d3565e65 (diff) | |
parent | 246c313d457397f412f9fb5eed3ee02cf5d9a561 (diff) |
Merge pull request #671 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/settings')
-rw-r--r-- | app/lib/settings/scoped_settings.rb | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/app/lib/settings/scoped_settings.rb b/app/lib/settings/scoped_settings.rb index de4af3009..70de7b792 100644 --- a/app/lib/settings/scoped_settings.rb +++ b/app/lib/settings/scoped_settings.rb @@ -2,6 +2,11 @@ module Settings class ScopedSettings + DEFAULTING_TO_UNSCOPED = %w( + flavour + skin + ).freeze + def initialize(object) @object = object end @@ -50,15 +55,22 @@ module Settings Rails.cache.fetch(Setting.cache_key(key, @object)) do db_val = thing_scoped.find_by(var: key.to_s) if db_val - default_value = Setting.default_settings[key] + default_value = ScopedSettings.default_settings[key] return default_value.with_indifferent_access.merge!(db_val.value) if default_value.is_a?(Hash) db_val.value else - Setting.default_settings[key] + ScopedSettings.default_settings[key] end end end + class << self + def default_settings + defaulting = DEFAULTING_TO_UNSCOPED.map { |k| [k, Setting[k]] }.to_h + Setting.default_settings.merge!(defaulting) + end + end + protected def thing_scoped |