Fixed: can't select columns when creating a new query.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@795 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed: can't select columns when creating a new query.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@795 e93f8b46-1217-0410-a6f0-8f06a7374b81
cb8bee3a · Jean-Philippe Lang · 20b4e226 · cb8bee3a · cb8bee3a · cb8bee3a
Commit cb8bee3a authored Oct 03, 2007 by Jean-Philippe Lang
Showing with 4 additions and 8 deletions

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

list_issues.rhtml app/views/projects/list_issues.rhtml +2 -7

_form.rhtml app/views/queries/_form.rhtml +1 -0

No files found.
--- a/app/controllers/queries_controller.rb
+++ b/app/controllers/queries_controller.rb
@@ -37,7 +37,7 @@ class QueriesController < ApplicationController
      @query.add_filter(field, params[:operators][field], params[:values][field])
    end if params[:fields]
    
-    if request.post? and @query.save
+    if request.post? && params[:confirm] && @query.save
      flash[:notice] = l(:notice_successful_create)
      redirect_to :controller => 'projects', :action => 'list_issues', :id => @project, :query_id => @query
      return

--- a/app/views/projects/list_issues.rhtml
+++ b/app/views/projects/list_issues.rhtml
@@ -2,7 +2,7 @@
    <h2><%=l(:label_issue_plural)%></h2>
    <% set_html_title l(:label_issue_plural) %>
    
-    <% form_tag({:action => 'list_issues'}, :id => 'query_form') do %>
+    <% form_tag({ :controller => 'queries', :action => 'new', :project_id => @project }, :id => 'query_form') do %>
    <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
    <% end %>
    <div class="contextual">
@@ -18,12 +18,7 @@
                       }, :class => 'icon icon-reload'  %>
                       
    <% if current_role.allowed_to?(:save_queries) %>
-    <%= link_to_remote l(:button_save), 
-                       { :url => { :controller => 'queries', :action => 'new', :project_id => @project },
-                         :method => 'get',
-                         :update => "content",
-                         :with => "Form.serialize('query_form')"
-                       }, :class => 'icon icon-save' %>
+    <%= link_to l(:button_save), {}, :onclick => "$('query_form').submit(); return false;", :class => 'icon icon-save' %>
    <% end %>
    </div>
    <br />

--- a/app/views/queries/_form.rhtml
+++ b/app/views/queries/_form.rhtml
 <%= error_messages_for 'query' %>
+<%= hidden_field_tag 'confirm', 1 %>

 <div class="box">
 <div class="tabular">