Business intelligence made simple
Fixed query dropdown performance
Andrew Kane87c31a6430bf
diff --git a/app/assets/javascripts/blazer/selectize.js b/app/assets/javascripts/blazer/selectize.jsindex 63ec321f..e8853bf8 100644--- a/app/assets/javascripts/blazer/selectize.js+++ b/app/assets/javascripts/blazer/selectize.js@@ -2236,7 +2236,7 @@*/registerOption: function(data) {var key = hash_key(data[this.settings.valueField]);- if ((!key || this.options.hasOwnProperty(key)) && !this.settings.allowEmptyOption) return false;+ if (!key || this.options.hasOwnProperty(key)) return false;data.$order = data.$order || ++this.order;this.options[key] = data;return key;diff --git a/app/views/blazer/checks/_form.html.erb b/app/views/blazer/checks/_form.html.erbindex 6178dc5d..1d5e0f2f 100644--- a/app/views/blazer/checks/_form.html.erb+++ b/app/views/blazer/checks/_form.html.erb@@ -10,10 +10,13 @@<div class="form-group"><%= f.label :query_id, "Query" %><div class="hide">- <%= f.select :query_id, Blazer::Query.named.order(:name).map { |q| [q.name, q.id] }, {include_blank: true} %>+ <%= f.select :query_id, [], {include_blank: true} %></div><script>- $("#check_query_id").selectize().parents(".hide").removeClass("hide");+ var queries = <%= blazer_json_escape(Blazer::Query.named.order(:name).select("id, name").map { |q| {text: q.name, value: q.id} }.to_json).html_safe %>;+ var items = <%= blazer_json_escape([@check.query_id].compact.to_json).html_safe %>;++ $("#check_query_id").selectize({options: queries, items: items}).parents(".hide").removeClass("hide");</script></div>diff --git a/app/views/blazer/dashboards/_form.html.erb b/app/views/blazer/dashboards/_form.html.erbindex 2fb18d71..516274b7 100644--- a/app/views/blazer/dashboards/_form.html.erb+++ b/app/views/blazer/dashboards/_form.html.erb@@ -38,10 +38,11 @@ li:hover .glyphicon-remove {<div class="form-group"><%= f.label :query_id, "Add Chart" %><div class="hide">- <%= select_tag :query_id, options_for_select(Blazer::Query.named.order(:name).map { |q| [q.name, q.id] }), {include_blank: true, placeholder: "Select chart"} %>+ <%= select_tag :query_id, nil, {include_blank: true, placeholder: "Select chart"} %></div><script>- $("#query_id").selectize().parents(".hide").removeClass("hide");+ var queries = <%= blazer_json_escape(Blazer::Query.named.order(:name).select("id, name").map { |q| {text: q.name, value: q.id} }.to_json).html_safe %>;+ $("#query_id").selectize({options: queries}).parents(".hide").removeClass("hide");$("#query_id").change( function () {var $option = $(this).find("option:selected");if ($option.val() !== "") {