Business intelligence made simple
DRY map tooltips [skip ci]
Andrew Kanec2b2a15466fa
diff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rbindex 315b57df..c775e0f1 100644--- a/app/controllers/blazer/queries_controller.rb+++ b/app/controllers/blazer/queries_controller.rb@@ -282,7 +282,7 @@ module Blazerr[lat_index] && r[lon_index]end.map do |r|{- tooltip: r.each_with_index.map { |v, i| i == lat_index || i == lon_index ? nil : "<strong>#{ERB::Util.html_escape(@columns[i])}:</strong> #{ERB::Util.html_escape(v)}" }.compact.join("<br>").truncate(140, separator: " "),+ tooltip: map_tooltip(r.each_with_index.reject { |v, i| i == lat_index || i == lon_index }),latitude: r[lat_index],longitude: r[lon_index]}@@ -298,7 +298,7 @@ module Blazer@rows.filter_map do |r|if r[geo_index].is_a?(String) && (geometry = (JSON.parse(r[geo_index]) rescue nil)) && geometry.is_a?(Hash){- tooltip: r.each_with_index.map { |v, i| i == geo_index ? nil : "<strong>#{ERB::Util.html_escape(@columns[i])}:</strong> #{ERB::Util.html_escape(v)}" }.compact.join("<br>").truncate(140, separator: " "),+ tooltip: map_tooltip(r.each_with_index.reject { |v, i| i == geo_index }),geometry: geometry}end@@ -306,6 +306,10 @@ module Blazerendend+ def map_tooltip(r)+ r.map { |v, i| "<strong>#{ERB::Util.html_escape(@columns[i])}:</strong> #{ERB::Util.html_escape(v)}" }.compact.join("<br>").truncate(140, separator: " ")+ end+def set_queries(limit = nil)@queries = Blazer::Query.named.select(:id, :name, :creator_id, :statement)@queries = @queries.includes(:creator) if Blazer.user_class