jro_apps/redmine Commit - r14844:d09b08046343

Merged r15202 (#22108)....

Jean-Philippe Lang -

r14844:d09b08046343

parent child

Context file:

r14844:d09b08046343

Collapse all files

The requested changes are too big and content was truncated. Show full diff

app/helpers/queries_helper.rb +30 0

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2015  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.
             module QueriesHelper
               include ApplicationHelper
               def filters_options_for_select(query)
                 ungrouped = []
                 grouped = {}
                 query.available_filters.map do |field, field_options|
                   if [:tree, :relation].include?(field_options[:type])
                     group = :label_related_issues
                   elsif field =~ /^(.+)\./
                     # association filters
                     group = "field_#{$1}"
                   elsif %w(member_of_group assigned_to_role).include?(field)
                     group = :field_assigned_to
                   elsif field_options[:type] == :date_past || field_options[:type] == :date
                     group = :label_date
                   end
                   if group
                     (grouped[group] ||= []) << [field_options[:name], field]
                   else
                     ungrouped << [field_options[:name], field]
                   end
                 end
                 # Don't group dates if there's only one (eg. time entries filters)
                 if grouped[:label_date].try(:size) == 1
                   ungrouped << grouped.delete(:label_date).first
                 end
                 s = options_for_select([[]] + ungrouped)
                 if grouped.present?
                   localized_grouped = grouped.map {|k,v| [l(k), v]}
                   s << grouped_options_for_select(localized_grouped)
                 end
                 s
               end
               def query_filters_hidden_tags(query)
                 tags = ''.html_safe
                 query.filters.each do |field, options|
                   tags << hidden_field_tag("f[]", field, :id => nil)
                   tags << hidden_field_tag("op[#{field}]", options[:operator], :id => nil)
                   options[:values].each do |value|
                     tags << hidden_field_tag("v[#{field}][]", value, :id => nil)
                   end
                 end
                 tags
               end
               def query_columns_hidden_tags(query)
                 tags = ''.html_safe
                 query.columns.each do |column|
                   tags << hidden_field_tag("c[]", column.name, :id => nil)
                 end
                 tags
               end
               def query_hidden_tags(query)
                 query_filters_hidden_tags(query) + query_columns_hidden_tags(query)
               end
               def available_block_columns_tags(query)
                 tags = ''.html_safe
                 query.available_block_columns.each do |column|
                   tags << content_tag('label', check_box_tag('c[]', column.name.to_s, query.has_column?(column), :id => nil) + " #{column.caption}", :class => 'inline')
                 end
                 tags
               end
               def available_totalable_columns_tags(query)
                 tags = ''.html_safe
                 query.available_totalable_columns.each do |column|
                   tags << content_tag('label', check_box_tag('t[]', column.name.to_s, query.totalable_columns.include?(column), :id => nil) + " #{column.caption}", :class => 'inline')
                 end
                 tags
               end
               def query_available_inline_columns_options(query)
                 (query.available_inline_columns - query.columns).reject(&:frozen?).collect {|column| [column.caption, column.name]}
               end
               def query_selected_inline_columns_options(query)
                 (query.inline_columns & query.available_inline_columns).reject(&:frozen?).collect {|column| [column.caption, column.name]}
               end
               def render_query_columns_selection(query, options={})
                 tag_name = (options[:name] || 'c') + '[]'
                 render :partial => 'queries/columns', :locals => {:query => query, :tag_name => tag_name}
               end
               def render_query_totals(query)
                 return unless query.totalable_columns.present?
                 totals = query.totalable_columns.map do |column|
                   total_tag(column, query.total_for(column))
                 end
                 content_tag('p', totals.join(" ").html_safe, :class => "query-totals")
               end
               def total_tag(column, value)
                 label = content_tag('span', "#{column.caption}:")
                 value = content_tag('span', format_object(value), :class => 'value')
                 content_tag('span', label + " " + value, :class => "total-for-#{column.name.to_s.dasherize}")
               end
               def column_header(column)
                 column.sortable ? sort_header_tag(column.name.to_s, :caption => column.caption,
                                                                     :default_order => column.default_order) :
                                   content_tag('th', h(column.caption))
               end
               def column_content(column, issue)
                 value = column.value_object(issue)
                 if value.is_a?(Array)
                   value.collect {|v| column_value(column, issue, v)}.compact.join(', ').html_safe
                 else
                   column_value(column, issue, value)
                 end
               end
               def column_value(column, issue, value)
                 case column.name
                 when :id
                   link_to value, issue_path(issue)
                 when :subject
                   link_to value, issue_path(issue)
                 when :parent
                   value ? (value.visible? ? link_to_issue(value, :subject => false) : "##{value.id}") : ''
                 when :description
                   issue.description? ? content_tag('div', textilizable(issue, :description), :class => "wiki") : ''
                 when :done_ratio
                   progress_bar(value)
                 when :relations
                   content_tag('span',
                     value.to_s(issue) {|other| link_to_issue(other, :subject => false, :tracker => false)}.html_safe,
                     :class => value.css_classes_for(issue))
                 else
                   format_object(value)
                 end
               end
               def csv_content(column, issue)
                 value = column.value_object(issue)
                 if value.is_a?(Array)
                   value.collect {|v| csv_value(column, issue, v)}.compact.join(', ')
                 else
                   csv_value(column, issue, value)
                 end
               end
               def csv_value(column, object, value)
                 format_object(value, false) do |value|
                   case value.class.name
                   when 'Float'
                     sprintf("%.2f", value).gsub('.', l(:general_csv_decimal_separator))
                   when 'IssueRelation'
                     value.to_s(object)
                   when 'Issue'
                     if object.is_a?(TimeEntry)
                       "#{value.tracker} ##{value.id}: #{value.subject}"
                     else
                       value.id
                     end
                   else
                     value
                   end
                 end
               end
               def query_to_csv(items, query, options={})
                 options ||= {}
                 columns = (options[:columns] == 'all' ? query.available_inline_columns : query.inline_columns)
                 query.available_block_columns.each do |column|
                   if options[column.name].present?
                     columns << column
                   end
                 end
                 Redmine::Export::CSV.generate do |csv|
                   # csv header fields
                   csv << columns.map {|c| c.caption.to_s}
                   # csv lines
                   items.each do |item|
                     csv << columns.map {|c| csv_content(c, item)}
                   end
                 end
               end
               # Retrieve query from session or build a new query
               def retrieve_query
                 if !params[:query_id].blank?
                   cond = "project_id IS NULL"
                   cond << " OR project_id = #{@project.id}" if @project
                   @query = IssueQuery.where(cond).find(params[:query_id])
                   raise ::Unauthorized unless @query.visible?
                   @query.project = @project
                   session[:query] = {:id => @query.id, :project_id => @query.project_id}
                   sort_clear
                 elsif api_request? || params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil)
                   # Give it a name, required to be valid
                   @query = IssueQuery.new(:name => "_")
                   @query.project = @project
                   @query.build_from_params(params)
                   session[:query] = {:project_id => @query.project_id, :filters => @query.filters, :group_by => @query.group_by, :column_names => @query.column_names, :totalable_names => @query.totalable_names}
                 else
                   # retrieve from session
                   @query = nil
                   @query = IssueQuery.find_by_id(session[:query][:id]) if session[:query][:id]
                   @query ||= IssueQuery.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names], :totalable_names => session[:query][:totalable_names])
                   @query.project = @project
                 end
               end
               def retrieve_query_from_session
                 if session[:query]
                   if session[:query][:id]
                     @query = IssueQuery.find_by_id(session[:query][:id])
                     return unless @query
                   else
                     @query = IssueQuery.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names], :totalable_names => session[:query][:totalable_names])
                   end
                   if session[:query].has_key?(:project_id)
                     @query.project_id = session[:query][:project_id]
                   else
                     @query.project = @project
                   end
                   @query
                 end
               end
+              # Returns the query definition as hidden field tags
+              def query_as_hidden_field_tags(query)
+                tags = hidden_field_tag("set_filter", "1", :id => nil)
+                if query.filters.present?
+                  query.filters.each do |field, filter|
+                    tags << hidden_field_tag("f[]", field, :id => nil)
+                    tags << hidden_field_tag("op[#{field}]", filter[:operator], :id => nil)
+                    filter[:values].each do |value|
+                      tags << hidden_field_tag("v[#{field}][]", value, :id => nil)
+                    end
+                  end
+                end
+                if query.column_names.present?
+                  query.column_names.each do |name|
+                    tags << hidden_field_tag("c[]", name, :id => nil)
+                  end
+                end
+                if query.totalable_names.present?
+                  query.totalable_names.each do |name|
+                    tags << hidden_field_tag("t[]", name, :id => nil)
+                  end
+                end
+                if query.group_by.present?
+                  tags << hidden_field_tag("group_by", query.group_by, :id => nil)
+                end
+                tags
+              end
             end

app/views/issues/index.html.erb +4 -2

             <div class="contextual">
             <% if !@query.new_record? && @query.editable_by?(User.current) %>
               <%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
               <%= delete_link query_path(@query) %>
             <% end %>
             </div>
             <h2><%= @query.new_record? ? l(:label_issue_plural) : @query.name %></h2>
             <% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
             <%= form_tag({ :controller => 'issues', :action => 'index', :project_id => @project },
                         :method => :get, :id => 'query_form') do %>
               <div id="query_form_with_buttons" class="hide-when-print">
                 <%= hidden_field_tag 'set_filter', '1' %>
                 <div id="query_form_content">
                 <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
                   <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
                   <div style="<%= @query.new_record? ? "" : "display: none;" %>">
                     <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
                   </div>
                 </fieldset>
                 <fieldset class="collapsible collapsed">
                   <legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
                   <div style="display: none;">
                     <table>
                       <tr>
                         <td><%= l(:field_column_names) %></td>
                         <td><%= render_query_columns_selection(@query) %></td>
                       </tr>
                       <tr>
                         <td><label for='group_by'><%= l(:field_group_by) %></label></td>
                         <td><%= select_tag('group_by',
                                            options_for_select(
                                              [[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]},
                                              @query.group_by)
                                    ) %></td>
                       </tr>
                       <tr>
                         <td><%= l(:button_show) %></td>
                         <td><%= available_block_columns_tags(@query) %></td>
                       </tr>
                       <tr>
                         <td><%= l(:label_total_plural) %></td>
                         <td><%= available_totalable_columns_tags(@query) %></td>
                       </tr>
                     </table>
                   </div>
                 </fieldset>
                 </div>
                 <p class="buttons">
                 <%= link_to_function l(:button_apply), '$("#query_form").submit()', :class => 'icon icon-checked' %>
                 <%= link_to l(:button_clear), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload'  %>
                 <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
                     <%= link_to_function l(:button_save),
                                          "$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit()",
                                          :class => 'icon icon-save' %>
                 <% end %>
                 </p>
               </div>
             <% end %>
             <%= error_messages_for 'query' %>
             <% if @query.valid? %>
             <% if @issues.empty? %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% else %>
             <%= render_query_totals(@query) %>
             <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
             <span class="pagination"><%= pagination_links_full @issue_pages, @issue_count %></span>
             <% end %>
             <% other_formats_links do |f| %>
               <%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
               <%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '350px'); return false;" %>
               <%= f.link_to 'PDF', :url => params %>
             <% end %>
             <div id="csv-export-options" style="display:none;">
               <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
-              <%= form_tag(params.merge({:format => 'csv',:page=>nil}), :method => :get, :id => 'csv-export-form') do %>
+              <%= form_tag(_project_issues_path(@project, :format => 'csv'), :method => :get, :id => 'csv-export-form') do %>
+              <%= query_as_hidden_field_tags(@query) %>
+              <%= hidden_field_tag 'sort', params[:sort], :id => nil %>
               <p>
                 <label><%= radio_button_tag 'csv[columns]', '', true %> <%= l(:description_selected_columns) %></label><br />
                 <label><%= radio_button_tag 'csv[columns]', 'all' %> <%= l(:description_all_columns) %></label>
               </p>
               <p>
                 <label><%= check_box_tag 'csv[description]', '1', @query.has_column?(:description) %> <%= l(:field_description) %></label>
               </p>
               <% if @issue_count > Setting.issues_export_limit.to_i %>
               <p class="icon icon-warning">
                 <%= l(:setting_issues_export_limit) %>: <%= Setting.issues_export_limit.to_i %>
               </p>
               <% end %>
               <p class="buttons">
                 <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>
                 <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
               </p>
               <% end %>
             </div>
             <% end %>
             <%= call_hook(:view_issues_index_bottom, { :issues => @issues, :project => @project, :query => @query }) %>
             <% content_for :sidebar do %>
                 <%= render :partial => 'issues/sidebar' %>
             <% end %>
             <% content_for :header_tags do %>
                 <%= auto_discovery_link_tag(:atom,
                                             {:query_id => @query, :format => 'atom',
                                              :page => nil, :key => User.current.rss_key},
                                             :title => l(:label_issue_plural)) %>
                 <%= auto_discovery_link_tag(:atom,
                                             {:controller => 'journals', :action => 'index',
                                              :query_id => @query, :format => 'atom',
                                              :page => nil, :key => User.current.rss_key},
                                             :title => l(:label_changes_details)) %>
             <% end %>
             <%= context_menu issues_context_menu_path %>

test/functional/issues_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

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