Business intelligence made simple
Added ability to inherit smart variables
Andrew Kanea6a317cb5dc8
diff --git a/app/controllers/blazer/base_controller.rb b/app/controllers/blazer/base_controller.rbindex 467cd0f2..cc181596 100644--- a/app/controllers/blazer/base_controller.rb+++ b/app/controllers/blazer/base_controller.rb@@ -69,7 +69,7 @@ module Blazersmart_var = result.rows.map { |v| v.reverse }error = result.error if result.errorend- return smart_var, error+ [smart_var, error]enddef extract_vars(statement)diff --git a/lib/blazer/data_source.rb b/lib/blazer/data_source.rbindex 9c9c55b6..e7bb7b27 100644--- a/lib/blazer/data_source.rb+++ b/lib/blazer/data_source.rb@@ -48,7 +48,15 @@ module Blazerenddef smart_variables- settings["smart_variables"] || {}+ @smart_variables ||= begin+ sv = settings["smart_variables"] || {}+ Array(settings["inherit_smart_variables"]).each do |ds|+ (Blazer.data_sources[ds].settings["smart_variables"] || {}).each do |k, v|+ sv[k] ||= v+ end+ end+ sv+ endenddef variable_defaults