浏览代码

Keep variables when forking a query with variables

Andrew Kane 9 年之前
父节点
当前提交
c863b192a0
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 1 1
      app/controllers/blazer/queries_controller.rb
  2. 3 3
      app/views/blazer/queries/show.html.erb

+ 1 - 1
app/controllers/blazer/queries_controller.rb

@@ -36,7 +36,7 @@ module Blazer
     end
     end
 
 
     def show
     def show
-      @statement = @query.statement
+      @statement = @query.statement.dup
       process_vars(@statement)
       process_vars(@statement)
 
 
       @smart_vars = {}
       @smart_vars = {}

+ 3 - 3
app/views/blazer/queries/show.html.erb

@@ -14,7 +14,7 @@
         <%= link_to "Fork", new_query_path(statement: @query.statement), class: "btn btn-info" %>
         <%= link_to "Fork", new_query_path(statement: @query.statement), class: "btn btn-info" %>
 
 
         <% if !@error and @success %>
         <% if !@error and @success %>
-          <%= button_to "Download", run_queries_path(statement: @query.statement, query_id: @query.id, format: "csv"), class: "btn btn-primary" %>
+          <%= button_to "Download", run_queries_path(statement: @statement, query_id: @query.id, format: "csv"), class: "btn btn-primary" %>
         <% end %>
         <% end %>
       </div>
       </div>
     </div>
     </div>
@@ -129,7 +129,7 @@
   </form>
   </form>
 <% end %>
 <% end %>
 
 
-<pre><code><%= @query.statement %></code></pre>
+<pre><code><%= @statement %></code></pre>
 
 
 <% if @success %>
 <% if @success %>
   <div id="results">
   <div id="results">
@@ -137,7 +137,7 @@
   </div>
   </div>
 
 
   <script>
   <script>
-    $.post("<%= run_queries_path %>", <%= json_escape({statement: @query.statement, query_id: @query.id}.to_json).html_safe %>, function (data) {
+    $.post("<%= run_queries_path %>", <%= json_escape({statement: @statement, query_id: @query.id}.to_json).html_safe %>, function (data) {
       $("#results").html(data);
       $("#results").html(data);
       $("#results table").stupidtable().stickyTableHeaders({fixedOffset: 60});
       $("#results table").stupidtable().stickyTableHeaders({fixedOffset: 60});
     });
     });