Skip to content

Business intelligence made simple

Changed inherit_smart_variables to inherit_smart_settings

Andrew Kanefee339a2519c
diff --git a/lib/blazer/data_source.rb b/lib/blazer/data_source.rb
index 9002dee1..572e483f 100644
--- a/lib/blazer/data_source.rb
+++ b/lib/blazer/data_source.rb
@@ -44,13 +44,21 @@ module Blazer
end
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
def smart_variables
@smart_variables ||= begin
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|
sv[k] ||= v
end