jro_apps/redmine Commit - r13173:db63f5a925f4

Fixed CSV content for parent issue column (#13608)....

Jean-Philippe Lang -

r13173:db63f5a925f4

parent child

Context file:

r13173:db63f5a925f4

Collapse all files

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

app/helpers/queries_helper.rb +2 0

              # encoding: utf-8
              #
              # Redmine - project management software
              # Copyright (C) 2006-2014  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)
                  options_for_select(filters_options(query))
                end
                def filters_options(query)
                  options = [[]]
                  options += query.available_filters.map do |field, field_options|
                    [field_options[:name], field]
                  end
                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 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 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 :description
                    issue.description? ? content_tag('div', textilizable(issue, :description), :class => "wiki") : ''
                  when :done_ratio
                    progress_bar(value, :width => '80px')
                  when :relations
                    other = value.other_issue(issue)
                    content_tag('span',
                      (l(value.label_for(issue)) + " " + 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, issue, value)
                  format_object(value, false) do |value|
                    case value.class.name
                    when 'Float'
                      sprintf("%.2f", value).gsub('.', l(:general_csv_decimal_separator))
                    when 'IssueRelation'
                      other = value.other_issue(issue)
                      l(value.label_for(issue)) + " ##{other.id}"
+                   when 'Issue'
+                     value.id
                    else
                      value
                    end
                  end
                end
                def query_to_csv(items, query, options={})
                  encoding = l(:general_csv_encoding)
                  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
                  export = CSV.generate(:col_sep => l(:general_csv_separator)) do |csv|
                    # csv header fields
                    csv << columns.collect {|c| Redmine::CodesetUtil.from_utf8(c.caption.to_s, encoding) }
                    # csv lines
                    items.each do |item|
                      csv << columns.collect {|c| Redmine::CodesetUtil.from_utf8(csv_content(c, item), encoding) }
                    end
                  end
                  export
                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}
                  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])
                    @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])
                    end
                    if session[:query].has_key?(:project_id)
                      @query.project_id = session[:query][:project_id]
                    else
                      @query.project = @project
                    end
                    @query
                  end
                end
              end

test/functional/issues_controller_test.rb 0 0

	1		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