|
@@ -44,13 +44,21 @@ module Blazer
|
|
end
|
|
end
|
|
|
|
|
|
def smart_columns
|
|
def smart_columns
|
|
- settings["smart_columns"] || {}
|
|
|
|
|
|
+ @smart_columns ||= begin
|
|
|
|
+ sc = settings["smart_columns"] || {}
|
|
|
|
+ Array(settings["inherit_smart_settings"]).each do |ds|
|
|
|
|
+ (Blazer.data_sources[ds].settings["smart_columns"] || {}).each do |k, v|
|
|
|
|
+ sc[k] ||= v
|
|
|
|
+ end
|
|
|
|
+ end
|
|
|
|
+ sc
|
|
|
|
+ end
|
|
end
|
|
end
|
|
|
|
|
|
def smart_variables
|
|
def smart_variables
|
|
@smart_variables ||= begin
|
|
@smart_variables ||= begin
|
|
sv = settings["smart_variables"] || {}
|
|
sv = settings["smart_variables"] || {}
|
|
- Array(settings["inherit_smart_variables"]).each do |ds|
|
|
|
|
|
|
+ Array(settings["inherit_smart_settings"]).each do |ds|
|
|
(Blazer.data_sources[ds].settings["smart_variables"] || {}).each do |k, v|
|
|
(Blazer.data_sources[ds].settings["smart_variables"] || {}).each do |k, v|
|
|
sv[k] ||= v
|
|
sv[k] ||= v
|
|
end
|
|
end
|