Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Load plugin settings. 

Along the lines for loading the locale files for a plugin we should also load the settings.yml for a plugin.  Updated version 04f3e09 that moves the loading to a function. I do not understand why it was necessary to define the function physically earlier in the file as I thought ruby did two pass but that may only apply to functions and not stray code in the class.
This commit is contained in:
Erik Ordway 2013-11-19 11:43:01 -08:00
parent 981d8f6aea
commit bf390163aa
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/models/site_setting.rb
View File

@ -7,14 +7,23 @@ class SiteSetting < ActiveRecord::Base
validates_presence_of :name validates_presence_of :name
validates_presence_of :data_type validates_presence_of :data_type
SiteSettings::YamlLoader.new( File.join( Rails.root, 'config', 'site_settings.yml') ).load do |category, name, default, opts| def self.load_settings(file)
if opts.delete(:client) SiteSettings::YamlLoader.new(file).load do |category, name, default, opts|
client_setting(name, default, opts.merge(category: category)) if opts.delete(:client)
else client_setting(name, default, opts.merge(category: category))
setting(name, default, opts.merge(category: category)) else
setting(name, default, opts.merge(category: category))
end
end end
end end
load_settings(File.join(Rails.root, 'config', 'site_settings.yml'))
Dir[File.join(Rails.root, "plugins", "*", "config", "settings.yml")].each do |file|
load_settings(file)
end
def self.call_discourse_hub? def self.call_discourse_hub?
self.enforce_global_nicknames? && self.discourse_org_access_key.present? self.enforce_global_nicknames? && self.discourse_org_access_key.present?
end end