Business intelligence made simple
Adds option to configure mapbox access token in settings (#244)
Marcus Malmbergac79ea3f5140
diff --git a/app/helpers/blazer/base_helper.rb b/app/helpers/blazer/base_helper.rbindex 7cd0229d..027d8d82 100644--- a/app/helpers/blazer/base_helper.rb+++ b/app/helpers/blazer/base_helper.rb@@ -29,7 +29,7 @@ module Blazerenddef blazer_maps?- ENV["MAPBOX_ACCESS_TOKEN"].present?+ Blazer.mapbox_access_token.present?enddef blazer_js_var(name, value)diff --git a/app/views/blazer/queries/run.html.erb b/app/views/blazer/queries/run.html.erbindex 8e84f63f..e1debdf2 100644--- a/app/views/blazer/queries/run.html.erb+++ b/app/views/blazer/queries/run.html.erb@@ -76,7 +76,7 @@<% if blazer_maps? && @markers.any? %><div id="map" style="height: <%= @only_chart ? 300 : 500 %>px;"></div><script>- L.mapbox.accessToken = '<%= ENV["MAPBOX_ACCESS_TOKEN"] %>';+ L.mapbox.accessToken = '<%= Blazer.mapbox_access_token %>';var map = L.mapbox.map('map', 'ankane.ioo8nki0');<%= blazer_js_var "markers", @markers %>var featureLayer = L.mapbox.featureLayer().addTo(map);diff --git a/lib/blazer.rb b/lib/blazer.rbindex ff219cb0..56fc2aa2 100644--- a/lib/blazer.rb+++ b/lib/blazer.rb@@ -52,6 +52,7 @@ module Blazerattr_accessor :query_editableattr_accessor :override_cspattr_accessor :slack_webhook_url+ attr_accessor :mapbox_access_tokenendself.audit = trueself.user_name = :namediff --git a/lib/blazer/engine.rb b/lib/blazer/engine.rbindex 18f06c0a..bf7ffec6 100644--- a/lib/blazer/engine.rb+++ b/lib/blazer/engine.rb@@ -26,6 +26,7 @@ module BlazerBlazer.images = Blazer.settings["images"] || falseBlazer.override_csp = Blazer.settings["override_csp"] || falseBlazer.slack_webhook_url = Blazer.settings["slack_webhook_url"] || ENV["BLAZER_SLACK_WEBHOOK_URL"]+ Blazer.mapbox_access_token = Blazer.settings["mapbox_access_token"] || ENV["MAPBOX_ACCESS_TOKEN"]endendenddiff --git a/lib/generators/blazer/templates/config.yml.tt b/lib/generators/blazer/templates/config.yml.ttindex 2468bcf2..cd923b6d 100644--- a/lib/generators/blazer/templates/config.yml.tt+++ b/lib/generators/blazer/templates/config.yml.tt@@ -68,3 +68,6 @@ check_schedules:# enable forecasting# note: with trend, time series are sent to https://trendapi.org# forecasting: trend++# enable map+# mapbox_access_token: <%%= ENV["MAPBOX_ACCESS_TOKEN"] %>