Skip to content

Business intelligence made simple

Fixed preview lag

Andrew Kanee27df577fd20
diff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rb
index b9a6851b..65379a69 100644
--- a/app/controllers/blazer/queries_controller.rb
+++ b/app/controllers/blazer/queries_controller.rb
@@ -129,8 +129,8 @@ module Blazer
end
def tables
- @data_source = params[:data_source]
- render layout: false
+ @tables = Blazer.data_sources[params[:data_source]].tables.keys
+ render partial: "tables", layout: false
end
private
diff --git a/app/views/blazer/queries/_form.html.erb b/app/views/blazer/queries/_form.html.erb
index 6c1d0749..866ec8a9 100644
--- a/app/views/blazer/queries/_form.html.erb
+++ b/app/views/blazer/queries/_form.html.erb
@@ -19,12 +19,12 @@
<% end %>
</div>
<%= f.select :data_source, Blazer.data_sources.values.map { |ds| [ds.name, ds.id] }, {}, class: ("hide" if Blazer.data_sources.size == 1), style: "width: 140px;" %>
- <div id="tables" style="display: inline-block; width: 260px; margin-right: 10px;"></div>
+ <div id="tables" style="display: inline-block; width: 260px; margin-right: 10px;" class="hide">
+ <%= render partial: "tables" %>
+ </div>
<script>
function updatePreviewSelect() {
- $("#tables").load("<%= tables_queries_path %>?" + $.param({data_source: $("#query_data_source").val()}), function () {
- $("#table_names").selectize({});
- });
+ $("#tables").load("<%= tables_queries_path %>?" + $.param({data_source: $("#query_data_source").val()}));
}
updatePreviewSelect();
$("#query_data_source").selectize().change(updatePreviewSelect);
diff --git a/app/views/blazer/queries/_tables.html b/app/views/blazer/queries/_tables.html
new file mode 100644
index 00000000..c1912a04
--- /dev/null
+++ b/app/views/blazer/queries/_tables.html
@@ -0,0 +1,5 @@
+<%= select_tag :table_names, options_for_select([["Preview table", nil]] + (@tables || [])), style: "width: 240px;" %>
+
+<script>
+ $("#table_names").selectize({}).parent().removeClass("hide");
+</script>
diff --git a/app/views/blazer/queries/tables.html b/app/views/blazer/queries/tables.html
deleted file mode 100644
index 9ee677e2..00000000
--- a/app/views/blazer/queries/tables.html
+++ /dev/null
@@ -1 +0,0 @@
-<%= select_tag :table_names, options_for_select([["Preview table", nil]] + Blazer.data_sources[@data_source].tables.keys), style: "width: 240px;" %>