jro_apps/redmine Commit - r784:cb8bee3a4e5a

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

Jean-Philippe Lang -

r784:cb8bee3a4e5a

parent child

Context file:

r784:cb8bee3a4e5a

Collapse all files

app/controllers/queries_controller.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class QueriesController < ApplicationController
               layout 'base'
               before_filter :find_project, :authorize
               def index
                 @queries = @project.queries.find(:all,
                                                  :order => "name ASC",
                                                  :conditions => ["is_public = ? or user_id = ?", true, (logged_in_user ? logged_in_user.id : 0)])
               end
               def new
                 @query = Query.new(params[:query])
                 @query.project = @project
                 @query.user = logged_in_user
                 @query.executed_by = logged_in_user
                 @query.is_public = false unless current_role.allowed_to?(:manage_public_queries)
                 @query.column_names = nil if params[:default_columns]
                 params[:fields].each do |field|
                   @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
                 end
                 render :layout => false if request.xhr?
               end
               def edit
                 if request.post?
                   @query.filters = {}
                   params[:fields].each do |field|
                     @query.add_filter(field, params[:operators][field], params[:values][field])
                   end if params[:fields]
                   @query.attributes = params[:query]
                   @query.is_public = false unless current_role.allowed_to?(:manage_public_queries)
                   @query.column_names = nil if params[:default_columns]
                   if @query.save
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :controller => 'projects', :action => 'list_issues', :id => @project, :query_id => @query
                   end
                 end
               end
               def destroy
                 @query.destroy if request.post?
                 redirect_to :controller => 'queries', :project_id => @project
               end
             private
               def find_project
                 if params[:id]
                   @query = Query.find(params[:id])
                   @query.executed_by = logged_in_user
                   @project = @query.project
                   render_403 unless @query.editable_by?(logged_in_user)
                 else
                   @project = Project.find(params[:project_id])
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

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

             <% if @query.new_record? %>
                 <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">
                 <%= link_to_remote l(:button_apply),
                                    { :url => { :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 },
                                      :update => "content",
                                      :with => "Form.serialize('query_form')"
                                    }, :class => 'icon icon-edit' %>
                 <%= link_to_remote l(:button_clear),
                                    { :url => {:controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1},
                                      :update => "content",
                                    }, :class => 'icon icon-reload'  %>
                 <% if current_role.allowed_to?(:save_queries) %>
-                <%= link_to_remote l(:button_save),
+                <%= link_to l(:button_save), {}, :onclick => "$('query_form').submit(); return false;", :class => 'icon icon-save' %>
-                                   { :url => { :controller => 'queries', :action => 'new', :project_id => @project },
-                                     :method => 'get',
-                                     :update => "content",
-                                     :with => "Form.serialize('query_form')"
-                                   }, :class => 'icon icon-save' %>
                 <% end %>
                 </div>
                 <br />
             <% else %>
                 <div class="contextual">
                 <% if @query.editable_by?(User.current) %>
                 <%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'icon icon-edit' %>
                 <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
                 <% end %>
                 </div>
                 <h2><%= @query.name %></h2>
                 <% set_html_title @query.name %>
             <% end %>
             <%= error_messages_for 'query' %>
             <% if @query.valid? %>
             <% if @issues.empty? %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% else %>
             &nbsp;
             <% form_tag({:controller => 'projects', :action => 'move_issues', :id => @project}, :id => 'issues_form' ) do %>
             <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
             <div class="contextual">
             <%= l(:label_export_to) %>
             <%= link_to 'CSV', {:action => 'export_issues_csv', :id => @project}, :class => 'icon icon-csv' %>,
             <%= link_to 'PDF', {:action => 'export_issues_pdf', :id => @project}, :class => 'icon icon-pdf' %>
             </div>
             <p><%= submit_tag(l(:button_move), :class => "button-small") if authorize_for('projects', 'move_issues') %>
             <%= pagination_links_full @issue_pages %>
             [ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]
             </p>
             <% end %>
             <% end %>
             <% end %>
             <% content_for :sidebar do %>
                 <%= render :partial => 'issues/sidebar' %>
             <% end %>

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

             <%= error_messages_for 'query' %>
+            <%= hidden_field_tag 'confirm', 1 %>
             <div class="box">
             <div class="tabular">
             <p><label for="query_name"><%=l(:field_name)%></label>
             <%= text_field 'query', 'name', :size => 80 %></p>
             <% if current_role.allowed_to?(:manage_public_queries) %>
               <p><label for="query_is_public"><%=l(:field_is_public)%></label>
               <%= check_box 'query', 'is_public' %></p>
             <% end %>
             <p><label for="query_default_columns"><%=l(:label_default_columns)%></label>
             <%= check_box_tag 'default_columns', 1, @query.has_default_columns?, :id => 'query_default_columns',
                   :onclick => 'if (this.checked) {Element.hide("columns")} else {Element.show("columns")}' %></p>
             </div>
             <%= render :partial => 'queries/filters', :locals => {:query => query}%>
             <%= render :partial => 'queries/columns', :locals => {:query => query}%>
             </div>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages