jro_apps/redmine Commit - r11217:9b1ebd6808d2

Refactor: makes issue id a regular QueryColumn....

Jean-Philippe Lang -

r11217:9b1ebd6808d2

parent child

Context file:

r11217:9b1ebd6808d2

Collapse all files

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

app/helpers/issues_helper.rb +2 -2

              # encoding: utf-8
              #
              # Redmine - project management software
              # Copyright (C) 2006-2013  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 IssuesHelper
                include ApplicationHelper
                def issue_list(issues, &block)
                  ancestors = []
                  issues.each do |issue|
                    while (ancestors.any? && !issue.is_descendant_of?(ancestors.last))
                      ancestors.pop
                    end
                    yield issue, ancestors.size
                    ancestors << issue unless issue.leaf?
                  end
                end
                # Renders a HTML/CSS tooltip
                #
                # To use, a trigger div is needed.  This is a div with the class of "tooltip"
                # that contains this method wrapped in a span with the class of "tip"
                #
                #    <div class="tooltip"><%= link_to_issue(issue) %>
                #      <span class="tip"><%= render_issue_tooltip(issue) %></span>
                #    </div>
                #
                def render_issue_tooltip(issue)
                  @cached_label_status ||= l(:field_status)
                  @cached_label_start_date ||= l(:field_start_date)
                  @cached_label_due_date ||= l(:field_due_date)
                  @cached_label_assigned_to ||= l(:field_assigned_to)
                  @cached_label_priority ||= l(:field_priority)
                  @cached_label_project ||= l(:field_project)
                  link_to_issue(issue) + "<br /><br />".html_safe +
                    "<strong>#{@cached_label_project}</strong>: #{link_to_project(issue.project)}<br />".html_safe +
                    "<strong>#{@cached_label_status}</strong>: #{h(issue.status.name)}<br />".html_safe +
                    "<strong>#{@cached_label_start_date}</strong>: #{format_date(issue.start_date)}<br />".html_safe +
                    "<strong>#{@cached_label_due_date}</strong>: #{format_date(issue.due_date)}<br />".html_safe +
                    "<strong>#{@cached_label_assigned_to}</strong>: #{h(issue.assigned_to)}<br />".html_safe +
                    "<strong>#{@cached_label_priority}</strong>: #{h(issue.priority.name)}".html_safe
                end
                def issue_heading(issue)
                  h("#{issue.tracker} ##{issue.id}")
                end
                def render_issue_subject_with_tree(issue)
                  s = ''
                  ancestors = issue.root? ? [] : issue.ancestors.visible.all
                  ancestors.each do |ancestor|
                    s << '<div>' + content_tag('p', link_to_issue(ancestor, :project => (issue.project_id != ancestor.project_id)))
                  end
                  s << '<div>'
                  subject = h(issue.subject)
                  if issue.is_private?
                    subject = content_tag('span', l(:field_is_private), :class => 'private') + ' ' + subject
                  end
                  s << content_tag('h3', subject)
                  s << '</div>' * (ancestors.size + 1)
                  s.html_safe
                end
                def render_descendants_tree(issue)
                  s = '<form><table class="list issues">'
                  issue_list(issue.descendants.visible.sort_by(&:lft)) do |child, level|
                    css = "issue issue-#{child.id} hascontextmenu"
                    css << " idnt idnt-#{level}" if level > 0
                    s << content_tag('tr',
                           content_tag('td', check_box_tag("ids[]", child.id, false, :id => nil), :class => 'checkbox') +
                           content_tag('td', link_to_issue(child, :truncate => 60, :project => (issue.project_id != child.project_id)), :class => 'subject') +
                           content_tag('td', h(child.status)) +
                           content_tag('td', link_to_user(child.assigned_to)) +
                           content_tag('td', progress_bar(child.done_ratio, :width => '80px')),
                           :class => css)
                  end
                  s << '</table></form>'
                  s.html_safe
                end
                # Returns a link for adding a new subtask to the given issue
                def link_to_new_subtask(issue)
                  attrs = {
                    :tracker_id => issue.tracker,
                    :parent_issue_id => issue
                  }
                  link_to(l(:button_add), new_project_issue_path(issue.project, :issue => attrs))
                end
                class IssueFieldsRows
                  include ActionView::Helpers::TagHelper
                  def initialize
                    @left = []
                    @right = []
                  end
                  def left(*args)
                    args.any? ? @left << cells(*args) : @left
                  end
                  def right(*args)
                    args.any? ? @right << cells(*args) : @right
                  end
                  def size
                    @left.size > @right.size ? @left.size : @right.size
                  end
                  def to_html
                    html = ''.html_safe
                    blank = content_tag('th', '') + content_tag('td', '')
                    size.times do |i|
                      left = @left[i] || blank
                      right = @right[i] || blank
                      html << content_tag('tr', left + right)
                    end
                    html
                  end
                  def cells(label, text, options={})
                    content_tag('th', "#{label}:", options) + content_tag('td', text, options)
                  end
                end
                def issue_fields_rows
                  r = IssueFieldsRows.new
                  yield r
                  r.to_html
                end
                def render_custom_fields_rows(issue)
                  return if issue.custom_field_values.empty?
                  ordered_values = []
                  half = (issue.custom_field_values.size / 2.0).ceil
                  half.times do |i|
                    ordered_values << issue.custom_field_values[i]
                    ordered_values << issue.custom_field_values[i + half]
                  end
                  s = "<tr>\n"
                  n = 0
                  ordered_values.compact.each do |value|
                    s << "</tr>\n<tr>\n" if n > 0 && (n % 2) == 0
                    s << "\t<th>#{ h(value.custom_field.name) }:</th><td>#{ simple_format_without_paragraph(h(show_value(value))) }</td>\n"
                    n += 1
                  end
                  s << "</tr>\n"
                  s.html_safe
                end
                def issues_destroy_confirmation_message(issues)
                  issues = [issues] unless issues.is_a?(Array)
                  message = l(:text_issues_destroy_confirmation)
                  descendant_count = issues.inject(0) {|memo, i| memo += (i.right - i.left - 1)/2}
                  if descendant_count > 0
                    issues.each do |issue|
                      next if issue.root?
                      issues.each do |other_issue|
                        descendant_count -= 1 if issue.is_descendant_of?(other_issue)
                      end
                    end
                    if descendant_count > 0
                      message << "\n" + l(:text_issues_destroy_descendants_confirmation, :count => descendant_count)
                    end
                  end
                  message
                end
                def sidebar_queries
                  unless @sidebar_queries
                    @sidebar_queries = IssueQuery.visible.all(
                      :order => "#{Query.table_name}.name ASC",
                      # Project specific queries and global queries
                      :conditions => (@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id])
                    )
                  end
                  @sidebar_queries
                end
                def query_links(title, queries)
                  # links to #index on issues/show
                  url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : params
                  content_tag('h3', h(title)) +
                    queries.collect {|query|
                        css = 'query'
                        css << ' selected' if query == @query
                        link_to(h(query.name), url_params.merge(:query_id => query), :class => css)
                      }.join('<br />').html_safe
                end
                def render_sidebar_queries
                  out = ''.html_safe
                  queries = sidebar_queries.select {|q| !q.is_public?}
                  out << query_links(l(:label_my_queries), queries) if queries.any?
                  queries = sidebar_queries.select {|q| q.is_public?}
                  out << query_links(l(:label_query_plural), queries) if queries.any?
                  out
                end
                # Returns the textual representation of a journal details
                # as an array of strings
                def details_to_strings(details, no_html=false, options={})
                  options[:only_path] = (options[:only_path] == false ? false : true)
                  strings = []
                  values_by_field = {}
                  details.each do |detail|
                    if detail.property == 'cf'
                      field_id = detail.prop_key
                      field = CustomField.find_by_id(field_id)
                      if field && field.multiple?
                        values_by_field[field_id] ||= {:added => [], :deleted => []}
                        if detail.old_value
                          values_by_field[field_id][:deleted] << detail.old_value
                        end
                        if detail.value
                          values_by_field[field_id][:added] << detail.value
                        end
                        next
                      end
                    end
                    strings << show_detail(detail, no_html, options)
                  end
                  values_by_field.each do |field_id, changes|
                    detail = JournalDetail.new(:property => 'cf', :prop_key => field_id)
                    if changes[:added].any?
                      detail.value = changes[:added]
                      strings << show_detail(detail, no_html, options)
                    elsif changes[:deleted].any?
                      detail.old_value = changes[:deleted]
                      strings << show_detail(detail, no_html, options)
                    end
                  end
                  strings
                end
                # Returns the textual representation of a single journal detail
                def show_detail(detail, no_html=false, options={})
                  multiple = false
                  case detail.property
                  when 'attr'
                    field = detail.prop_key.to_s.gsub(/\_id$/, "")
                    label = l(("field_" + field).to_sym)
                    case detail.prop_key
                    when 'due_date', 'start_date'
                      value = format_date(detail.value.to_date) if detail.value
                      old_value = format_date(detail.old_value.to_date) if detail.old_value
                    when 'project_id', 'status_id', 'tracker_id', 'assigned_to_id',
                          'priority_id', 'category_id', 'fixed_version_id'
                      value = find_name_by_reflection(field, detail.value)
                      old_value = find_name_by_reflection(field, detail.old_value)
                    when 'estimated_hours'
                      value = "%0.02f" % detail.value.to_f unless detail.value.blank?
                      old_value = "%0.02f" % detail.old_value.to_f unless detail.old_value.blank?
                    when 'parent_id'
                      label = l(:field_parent_issue)
                      value = "##{detail.value}" unless detail.value.blank?
                      old_value = "##{detail.old_value}" unless detail.old_value.blank?
                    when 'is_private'
                      value = l(detail.value == "0" ? :general_text_No : :general_text_Yes) unless detail.value.blank?
                      old_value = l(detail.old_value == "0" ? :general_text_No : :general_text_Yes) unless detail.old_value.blank?
                    end
                  when 'cf'
                    custom_field = CustomField.find_by_id(detail.prop_key)
                    if custom_field
                      multiple = custom_field.multiple?
                      label = custom_field.name
                      value = format_value(detail.value, custom_field.field_format) if detail.value
                      old_value = format_value(detail.old_value, custom_field.field_format) if detail.old_value
                    end
                  when 'attachment'
                    label = l(:label_attachment)
                  end
                  call_hook(:helper_issues_show_detail_after_setting,
                            {:detail => detail, :label => label, :value => value, :old_value => old_value })
                  label ||= detail.prop_key
                  value ||= detail.value
                  old_value ||= detail.old_value
                  unless no_html
                    label = content_tag('strong', label)
                    old_value = content_tag("i", h(old_value)) if detail.old_value
                    old_value = content_tag("del", old_value) if detail.old_value and detail.value.blank?
                    if detail.property == 'attachment' && !value.blank? && atta = Attachment.find_by_id(detail.prop_key)
                      # Link to the attachment if it has not been removed
                      value = link_to_attachment(atta, :download => true, :only_path => options[:only_path])
                      if options[:only_path] != false && atta.is_text?
                        value += link_to(
                                     image_tag('magnifier.png'),
                                     :controller => 'attachments', :action => 'show',
                                     :id => atta, :filename => atta.filename
                                   )
                      end
                    else
                      value = content_tag("i", h(value)) if value
                    end
                  end
                  if detail.property == 'attr' && detail.prop_key == 'description'
                    s = l(:text_journal_changed_no_detail, :label => label)
                    unless no_html
                      diff_link = link_to 'diff',
                        {:controller => 'journals', :action => 'diff', :id => detail.journal_id,
                         :detail_id => detail.id, :only_path => options[:only_path]},
                        :title => l(:label_view_diff)
                      s << " (#{ diff_link })"
                    end
                    s.html_safe
                  elsif detail.value.present?
                    case detail.property
                    when 'attr', 'cf'
                      if detail.old_value.present?
                        l(:text_journal_changed, :label => label, :old => old_value, :new => value).html_safe
                      elsif multiple
                        l(:text_journal_added, :label => label, :value => value).html_safe
                      else
                        l(:text_journal_set_to, :label => label, :value => value).html_safe
                      end
                    when 'attachment'
                      l(:text_journal_added, :label => label, :value => value).html_safe
                    end
                  else
                    l(:text_journal_deleted, :label => label, :old => old_value).html_safe
                  end
                end
                # Find the name of an associated record stored in the field attribute
                def find_name_by_reflection(field, id)
                  unless id.present?
                    return nil
                  end
                  association = Issue.reflect_on_association(field.to_sym)
                  if association
                    record = association.class_name.constantize.find_by_id(id)
                    return record.name if record
                  end
                end
                # Renders issue children recursively
                def render_api_issue_children(issue, api)
                  return if issue.leaf?
                  api.array :children do
                    issue.children.each do |child|
                      api.issue(:id => child.id) do
                        api.tracker(:id => child.tracker_id, :name => child.tracker.name) unless child.tracker.nil?
                        api.subject child.subject
                        render_api_issue_children(child, api)
                      end
                    end
                  end
                end
                def issues_to_csv(issues, project, query, options={})
                  encoding = l(:general_csv_encoding)
                  columns = (options[:columns] == 'all' ? query.available_inline_columns : query.inline_columns)
                  if options[:description]
                    if description = query.available_columns.detect {|q| q.name == :description}
                      columns << description
                    end
                  end
                  export = FCSV.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 << columns.collect {|c| Redmine::CodesetUtil.from_utf8(c.caption.to_s, encoding) }
                    # csv lines
                    issues.each do |issue|
-                     csv << [ issue.id.to_s ] + columns.collect {|c| Redmine::CodesetUtil.from_utf8(csv_content(c, issue), encoding) }
+                     csv << columns.collect {|c| Redmine::CodesetUtil.from_utf8(csv_content(c, issue), encoding) }
                    end
                  end
                  export
                end
              end

app/helpers/queries_helper.rb +3 -1

              # encoding: utf-8
              #
              # Redmine - project management software
              # Copyright (C) 2006-2013  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
                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 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)) + " #{column.caption}", :class => 'inline')
                  end
                  tags
                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(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 value.class.name
                  when 'String'
                    if column.name == :subject
                      link_to(h(value), :controller => 'issues', :action => 'show', :id => issue)
                    elsif column.name == :description
                      issue.description? ? content_tag('div', textilizable(issue, :description), :class => "wiki") : ''
                    else
                      h(value)
                    end
                  when 'Time'
                    format_time(value)
                  when 'Date'
                    format_date(value)
                  when 'Fixnum'
-                   if column.name == :done_ratio
+                   if column.name == :id
+                     link_to value, issue_path(issue)
+                   elsif column.name == :done_ratio
                      progress_bar(value, :width => '80px')
                    else
                      value.to_s
                    end
                  when 'Float'
                    sprintf "%.2f", value
                  when 'User'
                    link_to_user value
                  when 'Project'
                    link_to_project value
                  when 'Version'
                    link_to(h(value), :controller => 'versions', :action => 'show', :id => value)
                  when 'TrueClass'
                    l(:general_text_Yes)
                  when 'FalseClass'
                    l(:general_text_No)
                  when 'Issue'
                    value.visible? ? link_to_issue(value) : "##{value.id}"
                  when 'IssueRelation'
                    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
                    h(value)
                  end
                end
                def csv_content(column, issue)
                  value = column.value(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)
                  case value.class.name
                  when 'Time'
                    format_time(value)
                  when 'Date'
                    format_date(value)
                  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}"
                  else
                    value.to_s
                  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.find(params[:query_id], :conditions => cond)
                    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 = 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

app/models/issue_query.rb +1 -4

              # Redmine - project management software
              # Copyright (C) 2006-2013  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 IssueQuery < Query
                self.queried_class = Issue
                self.available_columns = [
+                 QueryColumn.new(:id, :sortable => "#{Issue.table_name}.id", :default_order => 'desc', :caption => '#', :frozen => true),
                  QueryColumn.new(:project, :sortable => "#{Project.table_name}.name", :groupable => true),
                  QueryColumn.new(:tracker, :sortable => "#{Tracker.table_name}.position", :groupable => true),
                  QueryColumn.new(:parent, :sortable => ["#{Issue.table_name}.root_id", "#{Issue.table_name}.lft ASC"], :default_order => 'desc', :caption => :field_parent_issue),
                  QueryColumn.new(:status, :sortable => "#{IssueStatus.table_name}.position", :groupable => true),
                  QueryColumn.new(:priority, :sortable => "#{IssuePriority.table_name}.position", :default_order => 'desc', :groupable => true),
                  QueryColumn.new(:subject, :sortable => "#{Issue.table_name}.subject"),
                  QueryColumn.new(:author, :sortable => lambda {User.fields_for_order_statement("authors")}, :groupable => true),
                  QueryColumn.new(:assigned_to, :sortable => lambda {User.fields_for_order_statement}, :groupable => true),
                  QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on", :default_order => 'desc'),
                  QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name", :groupable => true),
                  QueryColumn.new(:fixed_version, :sortable => lambda {Version.fields_for_order_statement}, :groupable => true),
                  QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"),
                  QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"),
                  QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),
                  QueryColumn.new(:done_ratio, :sortable => "#{Issue.table_name}.done_ratio", :groupable => true),
                  QueryColumn.new(:created_on, :sortable => "#{Issue.table_name}.created_on", :default_order => 'desc'),
                  QueryColumn.new(:closed_on, :sortable => "#{Issue.table_name}.closed_on", :default_order => 'desc'),
                  QueryColumn.new(:relations, :caption => :label_related_issues),
                  QueryColumn.new(:description, :inline => false)
                ]
                scope :visible, lambda {|*args|
                  user = args.shift || User.current
                  base = Project.allowed_to_condition(user, :view_issues, *args)
                  user_id = user.logged? ? user.id : 0
                  includes(:project).where("(#{table_name}.project_id IS NULL OR (#{base})) AND (#{table_name}.is_public = ? OR #{table_name}.user_id = ?)", true, user_id)
                }
                def initialize(attributes=nil, *args)
                  super attributes
                  self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
                end
                # Returns true if the query is visible to +user+ or the current user.
                def visible?(user=User.current)
                  (project.nil? || user.allowed_to?(:view_issues, project)) && (self.is_public? || self.user_id == user.id)
                end
                def initialize_available_filters
                  principals = []
                  subprojects = []
                  versions = []
                  categories = []
                  issue_custom_fields = []
                  if project
                    principals += project.principals.sort
                    unless project.leaf?
                      subprojects = project.descendants.visible.all
                      principals += Principal.member_of(subprojects)
                    end
                    versions = project.shared_versions.all
                    categories = project.issue_categories.all
                    issue_custom_fields = project.all_issue_custom_fields
                  else
                    if all_projects.any?
                      principals += Principal.member_of(all_projects)
                    end
                    versions = Version.visible.find_all_by_sharing('system')
                    issue_custom_fields = IssueCustomField.where(:is_filter => true, :is_for_all => true).all
                  end
                  principals.uniq!
                  principals.sort!
                  users = principals.select {|p| p.is_a?(User)}
                  add_available_filter "status_id",
                    :type => :list_status, :values => IssueStatus.sorted.all.collect{|s| [s.name, s.id.to_s] }
                  if project.nil?
                    project_values = []
                    if User.current.logged? && User.current.memberships.any?
                      project_values << ["<< #{l(:label_my_projects).downcase} >>", "mine"]
                    end
                    project_values += all_projects_values
                    add_available_filter("project_id",
                      :type => :list, :values => project_values
                    ) unless project_values.empty?
                  end
                  add_available_filter "tracker_id",
                    :type => :list, :values => trackers.collect{|s| [s.name, s.id.to_s] }
                  add_available_filter "priority_id",
                    :type => :list, :values => IssuePriority.all.collect{|s| [s.name, s.id.to_s] }
                  author_values = []
                  author_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
                  author_values += users.collect{|s| [s.name, s.id.to_s] }
                  add_available_filter("author_id",
                    :type => :list, :values => author_values
                  ) unless author_values.empty?
                  assigned_to_values = []
                  assigned_to_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
                  assigned_to_values += (Setting.issue_group_assignment? ?
                                            principals : users).collect{|s| [s.name, s.id.to_s] }
                  add_available_filter("assigned_to_id",
                    :type => :list_optional, :values => assigned_to_values
                  ) unless assigned_to_values.empty?
                  group_values = Group.all.collect {|g| [g.name, g.id.to_s] }
                  add_available_filter("member_of_group",
                    :type => :list_optional, :values => group_values
                  ) unless group_values.empty?
                  role_values = Role.givable.collect {|r| [r.name, r.id.to_s] }
                  add_available_filter("assigned_to_role",
                    :type => :list_optional, :values => role_values
                  ) unless role_values.empty?
                  if versions.any?
                    add_available_filter "fixed_version_id",
                      :type => :list_optional,
                      :values => versions.sort.collect{|s| ["#{s.project.name} - #{s.name}", s.id.to_s] }
                  end
                  if categories.any?
                    add_available_filter "category_id",
                      :type => :list_optional,
                      :values => categories.collect{|s| [s.name, s.id.to_s] }
                  end
                  add_available_filter "subject", :type => :text
                  add_available_filter "created_on", :type => :date_past
                  add_available_filter "updated_on", :type => :date_past
                  add_available_filter "closed_on", :type => :date_past
                  add_available_filter "start_date", :type => :date
                  add_available_filter "due_date", :type => :date
                  add_available_filter "estimated_hours", :type => :float
                  add_available_filter "done_ratio", :type => :integer
                  if User.current.allowed_to?(:set_issues_private, nil, :global => true) ||
                    User.current.allowed_to?(:set_own_issues_private, nil, :global => true)
                    add_available_filter "is_private",
                      :type => :list,
                      :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]]
                  end
                  if User.current.logged?
                    add_available_filter "watcher_id",
                      :type => :list, :values => [["<< #{l(:label_me)} >>", "me"]]
                  end
                  if subprojects.any?
                    add_available_filter "subproject_id",
                      :type => :list_subprojects,
                      :values => subprojects.collect{|s| [s.name, s.id.to_s] }
                  end
                  add_custom_fields_filters(issue_custom_fields)
                  add_associations_custom_fields_filters :project, :author, :assigned_to, :fixed_version
                  IssueRelation::TYPES.each do |relation_type, options|
                    add_available_filter relation_type, :type => :relation, :label => options[:name]
                  end
                  Tracker.disabled_core_fields(trackers).each {|field|
                    delete_available_filter field
                  }
                end
                def available_columns
                  return @available_columns if @available_columns
                  @available_columns = self.class.available_columns.dup
                  @available_columns += (project ?
                                          project.all_issue_custom_fields :
                                          IssueCustomField.all
                                         ).collect {|cf| QueryCustomFieldColumn.new(cf) }
                  if User.current.allowed_to?(:view_time_entries, project, :global => true)
                    index = nil
                    @available_columns.each_with_index {|column, i| index = i if column.name == :estimated_hours}
                    index = (index ? index + 1 : -1)
                    # insert the column after estimated_hours or at the end
                    @available_columns.insert index, QueryColumn.new(:spent_hours,
                      :sortable => "COALESCE((SELECT SUM(hours) FROM #{TimeEntry.table_name} WHERE #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id), 0)",
                      :default_order => 'desc',
                      :caption => :label_spent_time
                    )
                  end
                  if User.current.allowed_to?(:set_issues_private, nil, :global => true) ||
                    User.current.allowed_to?(:set_own_issues_private, nil, :global => true)
                    @available_columns << QueryColumn.new(:is_private, :sortable => "#{Issue.table_name}.is_private")
                  end
                  disabled_fields = Tracker.disabled_core_fields(trackers).map {|field| field.sub(/_id$/, '')}
                  @available_columns.reject! {|column|
                    disabled_fields.include?(column.name.to_s)
                  }
                  @available_columns
                end
-               def sortable_columns
-                 {'id' => "#{Issue.table_name}.id"}.merge(super)
-               end
                def default_columns_names
                  @default_columns_names ||= begin
                    default_columns = Setting.issue_list_default_columns.map(&:to_sym)
                    project.present? ? default_columns : [:project] | default_columns
                  end
                end
                # Returns the issue count
                def issue_count
                  Issue.visible.count(:include => [:status, :project], :conditions => statement)
                rescue ::ActiveRecord::StatementInvalid => e
                  raise StatementInvalid.new(e.message)
                end
                # Returns the issue count by group or nil if query is not grouped
                def issue_count_by_group
                  r = nil
                  if grouped?
                    begin
                      # Rails3 will raise an (unexpected) RecordNotFound if there's only a nil group value
                      r = Issue.visible.count(:joins => joins_for_order_statement(group_by_statement), :group => group_by_statement, :include => [:status, :project], :conditions => statement)
                    rescue ActiveRecord::RecordNotFound
                      r = {nil => issue_count}
                    end
                    c = group_by_column
                    if c.is_a?(QueryCustomFieldColumn)
                      r = r.keys.inject({}) {|h, k| h[c.custom_field.cast_value(k)] = r[k]; h}
                    end
                  end
                  r
                rescue ::ActiveRecord::StatementInvalid => e
                  raise StatementInvalid.new(e.message)
                end
                # Returns the issues
                # Valid options are :order, :offset, :limit, :include, :conditions
                def issues(options={})
                  order_option = [group_by_sort_order, options[:order]].flatten.reject(&:blank?)
                  issues = Issue.visible.where(options[:conditions]).all(
                    :include => ([:status, :project] + (options[:include] || [])).uniq,
                    :conditions => statement,
                    :order => order_option,
                    :joins => joins_for_order_statement(order_option.join(',')),
                    :limit  => options[:limit],
                    :offset => options[:offset]
                  )
                  if has_column?(:spent_hours)
                    Issue.load_visible_spent_hours(issues)
                  end
                  if has_column?(:relations)
                    Issue.load_visible_relations(issues)
                  end
                  issues
                rescue ::ActiveRecord::StatementInvalid => e
                  raise StatementInvalid.new(e.message)
                end
                # Returns the issues ids
                def issue_ids(options={})
                  order_option = [group_by_sort_order, options[:order]].flatten.reject(&:blank?)
                  Issue.visible.scoped(:conditions => options[:conditions]).scoped(:include => ([:status, :project] + (options[:include] || [])).uniq,
                                   :conditions => statement,
                                   :order => order_option,
                                   :joins => joins_for_order_statement(order_option.join(',')),
                                   :limit  => options[:limit],
                                   :offset => options[:offset]).find_ids
                rescue ::ActiveRecord::StatementInvalid => e
                  raise StatementInvalid.new(e.message)
                end
                # Returns the journals
                # Valid options are :order, :offset, :limit
                def journals(options={})
                  Journal.visible.all(
                    :include => [:details, :user, {:issue => [:project, :author, :tracker, :status]}],
                    :conditions => statement,
                    :order => options[:order],
                    :limit => options[:limit],
                    :offset => options[:offset]
                  )
                rescue ::ActiveRecord::StatementInvalid => e
                  raise StatementInvalid.new(e.message)
                end
                # Returns the versions
                # Valid options are :conditions
                def versions(options={})
                  Version.visible.where(options[:conditions]).all(
                    :include => :project,
                    :conditions => project_statement
                  )
                rescue ::ActiveRecord::StatementInvalid => e
                  raise StatementInvalid.new(e.message)
                end
                def sql_for_watcher_id_field(field, operator, value)
                  db_table = Watcher.table_name
                  "#{Issue.table_name}.id #{ operator == '=' ? 'IN' : 'NOT IN' } (SELECT #{db_table}.watchable_id FROM #{db_table} WHERE #{db_table}.watchable_type='Issue' AND " +
                    sql_for_field(field, '=', value, db_table, 'user_id') + ')'
                end
                def sql_for_member_of_group_field(field, operator, value)
                  if operator == '*' # Any group
                    groups = Group.all
                    operator = '=' # Override the operator since we want to find by assigned_to
                  elsif operator == "!*"
                    groups = Group.all
                    operator = '!' # Override the operator since we want to find by assigned_to
                  else
                    groups = Group.find_all_by_id(value)
                  end
                  groups ||= []
                  members_of_groups = groups.inject([]) {|user_ids, group|
                    user_ids + group.user_ids + [group.id]
                  }.uniq.compact.sort.collect(&:to_s)
                  '(' + sql_for_field("assigned_to_id", operator, members_of_groups, Issue.table_name, "assigned_to_id", false) + ')'
                end
                def sql_for_assigned_to_role_field(field, operator, value)
                  case operator
                  when "*", "!*" # Member / Not member
                    sw = operator == "!*" ? 'NOT' : ''
                    nl = operator == "!*" ? "#{Issue.table_name}.assigned_to_id IS NULL OR" : ''
                    "(#{nl} #{Issue.table_name}.assigned_to_id #{sw} IN (SELECT DISTINCT #{Member.table_name}.user_id FROM #{Member.table_name}" +
                      " WHERE #{Member.table_name}.project_id = #{Issue.table_name}.project_id))"
                  when "=", "!"
                    role_cond = value.any? ?
                      "#{MemberRole.table_name}.role_id IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")" :
                      "1=0"
                    sw = operator == "!" ? 'NOT' : ''
                    nl = operator == "!" ? "#{Issue.table_name}.assigned_to_id IS NULL OR" : ''
                    "(#{nl} #{Issue.table_name}.assigned_to_id #{sw} IN (SELECT DISTINCT #{Member.table_name}.user_id FROM #{Member.table_name}, #{MemberRole.table_name}" +
                      " WHERE #{Member.table_name}.project_id = #{Issue.table_name}.project_id AND #{Member.table_name}.id = #{MemberRole.table_name}.member_id AND #{role_cond}))"
                  end
                end
                def sql_for_is_private_field(field, operator, value)
                  op = (operator == "=" ? 'IN' : 'NOT IN')
                  va = value.map {|v| v == '0' ? connection.quoted_false : connection.quoted_true}.uniq.join(',')
                  "#{Issue.table_name}.is_private #{op} (#{va})"
                end
                def sql_for_relations(field, operator, value, options={})
                  relation_options = IssueRelation::TYPES[field]
                  return relation_options unless relation_options
                  relation_type = field
                  join_column, target_join_column = "issue_from_id", "issue_to_id"
                  if relation_options[:reverse] || options[:reverse]
                    relation_type = relation_options[:reverse] || relation_type
                    join_column, target_join_column = target_join_column, join_column
                  end
                  sql = case operator
                    when "*", "!*"
                      op = (operator == "*" ? 'IN' : 'NOT IN')
                      "#{Issue.table_name}.id #{op} (SELECT DISTINCT #{IssueRelation.table_name}.#{join_column} FROM #{IssueRelation.table_name} WHERE #{IssueRelation.table_name}.relation_type = '#{connection.quote_string(relation_type)}')"
                    when "=", "!"
                      op = (operator == "=" ? 'IN' : 'NOT IN')
                      "#{Issue.table_name}.id #{op} (SELECT DISTINCT #{IssueRelation.table_name}.#{join_column} FROM #{IssueRelation.table_name} WHERE #{IssueRelation.table_name}.relation_type = '#{connection.quote_string(relation_type)}' AND #{IssueRelation.table_name}.#{target_join_column} = #{value.first.to_i})"
                    when "=p", "=!p", "!p"
                      op = (operator == "!p" ? 'NOT IN' : 'IN')
                      comp = (operator == "=!p" ? '<>' : '=')
                      "#{Issue.table_name}.id #{op} (SELECT DISTINCT #{IssueRelation.table_name}.#{join_column} FROM #{IssueRelation.table_name}, #{Issue.table_name} relissues WHERE #{IssueRelation.table_name}.relation_type = '#{connection.quote_string(relation_type)}' AND #{IssueRelation.table_name}.#{target_join_column} = relissues.id AND relissues.project_id #{comp} #{value.first.to_i})"
                    end
                  if relation_options[:sym] == field && !options[:reverse]
                    sqls = [sql, sql_for_relations(field, operator, value, :reverse => true)]
                    sqls.join(["!", "!*", "!p"].include?(operator) ? " AND " : " OR ")
                  else
                    sql
                  end
                end
                IssueRelation::TYPES.keys.each do |relation_type|
                  alias_method "sql_for_#{relation_type}_field".to_sym, :sql_for_relations
                end
              end

app/models/query.rb +9 -3

              # Redmine - project management software
              # Copyright (C) 2006-2013  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 QueryColumn
                attr_accessor :name, :sortable, :groupable, :default_order
                include Redmine::I18n
                def initialize(name, options={})
                  self.name = name
                  self.sortable = options[:sortable]
                  self.groupable = options[:groupable] || false
                  if groupable == true
                    self.groupable = name.to_s
                  end
                  self.default_order = options[:default_order]
                  @inline = options.key?(:inline) ? options[:inline] : true
-                 @caption_key = options[:caption] || "field_#{name}"
+                 @caption_key = options[:caption] || "field_#{name}".to_sym
+                 @frozen = options[:frozen]
                end
                def caption
-                 l(@caption_key)
+                 @caption_key.is_a?(Symbol) ? l(@caption_key) : @caption_key
                end
                # Returns true if the column is sortable, otherwise false
                def sortable?
                  !@sortable.nil?
                end
                def sortable
                  @sortable.is_a?(Proc) ? @sortable.call : @sortable
                end
                def inline?
                  @inline
                end
+               def frozen?
+                 @frozen
+               end
                def value(object)
                  object.send name
                end
                def css_classes
                  name
                end
              end
              class QueryCustomFieldColumn < QueryColumn
                def initialize(custom_field)
                  self.name = "cf_#{custom_field.id}".to_sym
                  self.sortable = custom_field.order_statement || false
                  self.groupable = custom_field.group_statement || false
                  @inline = true
                  @cf = custom_field
                end
                def caption
                  @cf.name
                end
                def custom_field
                  @cf
                end
                def value(object)
                  cv = object.custom_values.select {|v| v.custom_field_id == @cf.id}.collect {|v| @cf.cast_value(v.value)}
                  cv.size > 1 ? cv.sort {|a,b| a.to_s <=> b.to_s} : cv.first
                end
                def css_classes
                  @css_classes ||= "#{name} #{@cf.field_format}"
                end
              end
              class QueryAssociationCustomFieldColumn < QueryCustomFieldColumn
                def initialize(association, custom_field)
                  super(custom_field)
                  self.name = "#{association}.cf_#{custom_field.id}".to_sym
                  # TODO: support sorting/grouping by association custom field
                  self.sortable = false
                  self.groupable = false
                  @association = association
                end
                def value(object)
                  if assoc = object.send(@association)
                    super(assoc)
                  end
                end
                def css_classes
                  @css_classes ||= "#{@association}_cf_#{@cf.id} #{@cf.field_format}"
                end
              end
              class Query < ActiveRecord::Base
                class StatementInvalid < ::ActiveRecord::StatementInvalid
                end
                belongs_to :project
                belongs_to :user
                serialize :filters
                serialize :column_names
                serialize :sort_criteria, Array
                attr_protected :project_id, :user_id
                validates_presence_of :name
                validates_length_of :name, :maximum => 255
                validate :validate_query_filters
                class_attribute :operators
                self.operators = {
                  "="   => :label_equals,
                  "!"   => :label_not_equals,
                  "o"   => :label_open_issues,
                  "c"   => :label_closed_issues,
                  "!*"  => :label_none,
                  "*"   => :label_any,
                  ">="  => :label_greater_or_equal,
                  "<="  => :label_less_or_equal,
                  "><"  => :label_between,
                  "<t+" => :label_in_less_than,
                  ">t+" => :label_in_more_than,
                  "><t+"=> :label_in_the_next_days,
                  "t+"  => :label_in,
                  "t"   => :label_today,
                  "ld"  => :label_yesterday,
                  "w"   => :label_this_week,
                  "lw"  => :label_last_week,
                  "l2w" => [:label_last_n_weeks, {:count => 2}],
                  "m"   => :label_this_month,
                  "lm"  => :label_last_month,
                  "y"   => :label_this_year,
                  ">t-" => :label_less_than_ago,
                  "<t-" => :label_more_than_ago,
                  "><t-"=> :label_in_the_past_days,
                  "t-"  => :label_ago,
                  "~"   => :label_contains,
                  "!~"  => :label_not_contains,
                  "=p"  => :label_any_issues_in_project,
                  "=!p" => :label_any_issues_not_in_project,
                  "!p"  => :label_no_issues_in_project
                }
                class_attribute :operators_by_filter_type
                self.operators_by_filter_type = {
                  :list => [ "=", "!" ],
                  :list_status => [ "o", "=", "!", "c", "*" ],
                  :list_optional => [ "=", "!", "!*", "*" ],
                  :list_subprojects => [ "*", "!*", "=" ],
                  :date => [ "=", ">=", "<=", "><", "<t+", ">t+", "><t+", "t+", "t", "ld", "w", "lw", "l2w", "m", "lm", "y", ">t-", "<t-", "><t-", "t-", "!*", "*" ],
                  :date_past => [ "=", ">=", "<=", "><", ">t-", "<t-", "><t-", "t-", "t", "ld", "w", "lw", "l2w", "m", "lm", "y", "!*", "*" ],
                  :string => [ "=", "~", "!", "!~", "!*", "*" ],
                  :text => [  "~", "!~", "!*", "*" ],
                  :integer => [ "=", ">=", "<=", "><", "!*", "*" ],
                  :float => [ "=", ">=", "<=", "><", "!*", "*" ],
                  :relation => ["=", "=p", "=!p", "!p", "!*", "*"]
                }
                class_attribute :available_columns
                self.available_columns = []
                class_attribute :queried_class
                def queried_table_name
                  @queried_table_name ||= self.class.queried_class.table_name
                end
                def initialize(attributes=nil, *args)
                  super attributes
                  @is_for_all = project.nil?
                end
                # Builds the query from the given params
                def build_from_params(params)
                  if params[:fields] || params[:f]
                    self.filters = {}
                    add_filters(params[:fields] || params[:f], params[:operators] || params[:op], params[:values] || params[:v])
                  else
                    available_filters.keys.each do |field|
                      add_short_filter(field, params[field]) if params[field]
                    end
                  end
                  self.group_by = params[:group_by] || (params[:query] && params[:query][:group_by])
                  self.column_names = params[:c] || (params[:query] && params[:query][:column_names])
                  self
                end
                # Builds a new query from the given params and attributes
                def self.build_from_params(params, attributes={})
                  new(attributes).build_from_params(params)
                end
                def validate_query_filters
                  filters.each_key do |field|
                    if values_for(field)
                      case type_for(field)
                      when :integer
                        add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^[+-]?\d+$/) }
                      when :float
                        add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^[+-]?\d+(\.\d*)?$/) }
                      when :date, :date_past
                        case operator_for(field)
                        when "=", ">=", "<=", "><"
                          add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && (!v.match(/^\d{4}-\d{2}-\d{2}$/) || (Date.parse(v) rescue nil).nil?) }
                        when ">t-", "<t-", "t-", ">t+", "<t+", "t+", "><t+", "><t-"
                          add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^\d+$/) }
                        end
                      end
                    end
                    add_filter_error(field, :blank) unless
                        # filter requires one or more values
                        (values_for(field) and !values_for(field).first.blank?) or
                        # filter doesn't require any value
                        ["o", "c", "!*", "*", "t", "ld", "w", "lw", "l2w", "m", "lm", "y"].include? operator_for(field)
                  end if filters
                end
                def add_filter_error(field, message)
                  m = label_for(field) + " " + l(message, :scope => 'activerecord.errors.messages')
                  errors.add(:base, m)
                end
                def editable_by?(user)
                  return false unless user
                  # Admin can edit them all and regular users can edit their private queries
                  return true if user.admin? || (!is_public && self.user_id == user.id)
                  # Members can not edit public queries that are for all project (only admin is allowed to)
                  is_public && !@is_for_all && user.allowed_to?(:manage_public_queries, project)
                end
                def trackers
                  @trackers ||= project.nil? ? Tracker.sorted.all : project.rolled_up_trackers
                end
                # Returns a hash of localized labels for all filter operators
                def self.operators_labels
                  operators.inject({}) {|h, operator| h[operator.first] = l(*operator.last); h}
                end
                # Returns a representation of the available filters for JSON serialization
                def available_filters_as_json
                  json = {}
                  available_filters.each do |field, options|
                    json[field] = options.slice(:type, :name, :values).stringify_keys
                  end
                  json
                end
                def all_projects
                  @all_projects ||= Project.visible.all
                end
                def all_projects_values
                  return @all_projects_values if @all_projects_values
                  values = []
                  Project.project_tree(all_projects) do |p, level|
                    prefix = (level > 0 ? ('--' * level + ' ') : '')
                    values << ["#{prefix}#{p.name}", p.id.to_s]
                  end
                  @all_projects_values = values
                end
                # Adds available filters
                def initialize_available_filters
                  # implemented by sub-classes
                end
                protected :initialize_available_filters
                # Adds an available filter
                def add_available_filter(field, options)
                  @available_filters ||= ActiveSupport::OrderedHash.new
                  @available_filters[field] = options
                  @available_filters
                end
                # Removes an available filter
                def delete_available_filter(field)
                  if @available_filters
                    @available_filters.delete(field)
                  end
                end
                # Return a hash of available filters
                def available_filters
                  unless @available_filters
                    initialize_available_filters
                    @available_filters.each do |field, options|
                      options[:name] ||= l(options[:label] || "field_#{field}".gsub(/_id$/, ''))
                    end
                  end
                  @available_filters
                end
                def add_filter(field, operator, values=nil)
                  # values must be an array
                  return unless values.nil? || values.is_a?(Array)
                  # check if field is defined as an available filter
                  if available_filters.has_key? field
                    filter_options = available_filters[field]
                    filters[field] = {:operator => operator, :values => (values || [''])}
                  end
                end
                def add_short_filter(field, expression)
                  return unless expression && available_filters.has_key?(field)
                  field_type = available_filters[field][:type]
                  operators_by_filter_type[field_type].sort.reverse.detect do |operator|
                    next unless expression =~ /^#{Regexp.escape(operator)}(.*)$/
                    values = $1
                    add_filter field, operator, values.present? ? values.split('|') : ['']
                  end || add_filter(field, '=', expression.split('|'))
                end
                # Add multiple filters using +add_filter+
                def add_filters(fields, operators, values)
                  if fields.is_a?(Array) && operators.is_a?(Hash) && (values.nil? || values.is_a?(Hash))
                    fields.each do |field|
                      add_filter(field, operators[field], values && values[field])
                    end
                  end
                end
                def has_filter?(field)
                  filters and filters[field]
                end
                def type_for(field)
                  available_filters[field][:type] if available_filters.has_key?(field)
                end
                def operator_for(field)
                  has_filter?(field) ? filters[field][:operator] : nil
                end
                def values_for(field)
                  has_filter?(field) ? filters[field][:values] : nil
                end
                def value_for(field, index=0)
                  (values_for(field) || [])[index]
                end
                def label_for(field)
                  label = available_filters[field][:name] if available_filters.has_key?(field)
                  label ||= l("field_#{field.to_s.gsub(/_id$/, '')}", :default => field)
                end
                def self.add_available_column(column)
                  self.available_columns << (column) if column.is_a?(QueryColumn)
                end
                # Returns an array of columns that can be used to group the results
                def groupable_columns
                  available_columns.select {|c| c.groupable}
                end
                # Returns a Hash of columns and the key for sorting
                def sortable_columns
                  available_columns.inject({}) {|h, column|
                    h[column.name.to_s] = column.sortable
                    h
                  }
                end
                def columns
                  # preserve the column_names order
-                 (has_default_columns? ? default_columns_names : column_names).collect do |name|
+                 cols = (has_default_columns? ? default_columns_names : column_names).collect do |name|
                     available_columns.find { |col| col.name == name }
                  end.compact
+                 available_columns.select(&:frozen?) | cols
                end
                def inline_columns
                  columns.select(&:inline?)
                end
                def block_columns
                  columns.reject(&:inline?)
                end
                def available_inline_columns
                  available_columns.select(&:inline?)
                end
                def available_block_columns
                  available_columns.reject(&:inline?)
                end
                def default_columns_names
                  []
                end
                def column_names=(names)
                  if names
                    names = names.select {|n| n.is_a?(Symbol) || !n.blank? }
                    names = names.collect {|n| n.is_a?(Symbol) ? n : n.to_sym }
                    # Set column_names to nil if default columns
                    if names == default_columns_names
                      names = nil
                    end
                  end
                  write_attribute(:column_names, names)
                end
                def has_column?(column)
                  column_names && column_names.include?(column.is_a?(QueryColumn) ? column.name : column)
                end
                def has_default_columns?
                  column_names.nil? || column_names.empty?
                end
                def sort_criteria=(arg)
                  c = []
                  if arg.is_a?(Hash)
                    arg = arg.keys.sort.collect {|k| arg[k]}
                  end
                  c = arg.select {|k,o| !k.to_s.blank?}.slice(0,3).collect {|k,o| [k.to_s, (o == 'desc' || o == false) ? 'desc' : 'asc']}
                  write_attribute(:sort_criteria, c)
                end
                def sort_criteria
                  read_attribute(:sort_criteria) || []
                end
                def sort_criteria_key(arg)
                  sort_criteria && sort_criteria[arg] && sort_criteria[arg].first
                end
                def sort_criteria_order(arg)
                  sort_criteria && sort_criteria[arg] && sort_criteria[arg].last
                end
                def sort_criteria_order_for(key)
                  sort_criteria.detect {|k, order| key.to_s == k}.try(:last)
                end
                # Returns the SQL sort order that should be prepended for grouping
                def group_by_sort_order
                  if grouped? && (column = group_by_column)
                    order = sort_criteria_order_for(column.name) || column.default_order
                    column.sortable.is_a?(Array) ?
                      column.sortable.collect {|s| "#{s} #{order}"}.join(',') :
                      "#{column.sortable} #{order}"
                  end
                end
                # Returns true if the query is a grouped query
                def grouped?
                  !group_by_column.nil?
                end
                def group_by_column
                  groupable_columns.detect {|c| c.groupable && c.name.to_s == group_by}
                end
                def group_by_statement
                  group_by_column.try(:groupable)
                end
                def project_statement
                  project_clauses = []
                  if project && !project.descendants.active.empty?
                    ids = [project.id]
                    if has_filter?("subproject_id")
                      case operator_for("subproject_id")
                      when '='
                        # include the selected subprojects
                        ids += values_for("subproject_id").each(&:to_i)
                      when '!*'
                        # main project only
                      else
                        # all subprojects
                        ids += project.descendants.collect(&:id)
                      end
                    elsif Setting.display_subprojects_issues?
                      ids += project.descendants.collect(&:id)
                    end
                    project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
                  elsif project
                    project_clauses << "#{Project.table_name}.id = %d" % project.id
                  end
                  project_clauses.any? ? project_clauses.join(' AND ') : nil
                end
                def statement
                  # filters clauses
                  filters_clauses = []
                  filters.each_key do |field|
                    next if field == "subproject_id"
                    v = values_for(field).clone
                    next unless v and !v.empty?
                    operator = operator_for(field)
                    # "me" value subsitution
                    if %w(assigned_to_id author_id user_id watcher_id).include?(field)
                      if v.delete("me")
                        if User.current.logged?
                          v.push(User.current.id.to_s)
                          v += User.current.group_ids.map(&:to_s) if field == 'assigned_to_id'
                        else
                          v.push("0")
                        end
                      end
                    end
                    if field == 'project_id'
                      if v.delete('mine')
                        v += User.current.memberships.map(&:project_id).map(&:to_s)
                      end
                    end
                    if field =~ /cf_(\d+)$/
                      # custom field
                      filters_clauses << sql_for_custom_field(field, operator, v, $1)
                    elsif respond_to?("sql_for_#{field}_field")
                      # specific statement
                      filters_clauses << send("sql_for_#{field}_field", field, operator, v)
                    else
                      # regular field
                      filters_clauses << '(' + sql_for_field(field, operator, v, queried_table_name, field) + ')'
                    end
                  end if filters and valid?
                  filters_clauses << project_statement
                  filters_clauses.reject!(&:blank?)
                  filters_clauses.any? ? filters_clauses.join(' AND ') : nil
                end
                private
                def sql_for_custom_field(field, operator, value, custom_field_id)
                  db_table = CustomValue.table_name
                  db_field = 'value'
                  filter = @available_filters[field]
                  return nil unless filter
                  if filter[:format] == 'user'
                    if value.delete('me')
                      value.push User.current.id.to_s
                    end
                  end
                  not_in = nil
                  if operator == '!'
                    # Makes ! operator work for custom fields with multiple values
                    operator = '='
                    not_in = 'NOT'
                  end
                  customized_key = "id"
                  customized_class = queried_class
                  if field =~ /^(.+)\.cf_/
                    assoc = $1
                    customized_key = "#{assoc}_id"
                    customized_class = queried_class.reflect_on_association(assoc.to_sym).klass.base_class rescue nil
                    raise "Unknown #{queried_class.name} association #{assoc}" unless customized_class
                  end
                  "#{queried_table_name}.#{customized_key} #{not_in} IN (SELECT #{customized_class.table_name}.id FROM #{customized_class.table_name} LEFT OUTER JOIN #{db_table} ON #{db_table}.customized_type='#{customized_class}' AND #{db_table}.customized_id=#{customized_class.table_name}.id AND #{db_table}.custom_field_id=#{custom_field_id} WHERE " +
                    sql_for_field(field, operator, value, db_table, db_field, true) + ')'
                end
                # Helper method to generate the WHERE sql for a +field+, +operator+ and a +value+
                def sql_for_field(field, operator, value, db_table, db_field, is_custom_filter=false)
                  sql = ''
                  case operator
                  when "="
                    if value.any?
                      case type_for(field)
                      when :date, :date_past
                        sql = date_clause(db_table, db_field, (Date.parse(value.first) rescue nil), (Date.parse(value.first) rescue nil))
                      when :integer
                        if is_custom_filter
                          sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) = #{value.first.to_i})"
                        else
                          sql = "#{db_table}.#{db_field} = #{value.first.to_i}"
                        end
                      when :float
                        if is_custom_filter
                          sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) BETWEEN #{value.first.to_f - 1e-5} AND #{value.first.to_f + 1e-5})"
                        else
                          sql = "#{db_table}.#{db_field} BETWEEN #{value.first.to_f - 1e-5} AND #{value.first.to_f + 1e-5}"
                        end
                      else
                        sql = "#{db_table}.#{db_field} IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
                      end
                    else
                      # IN an empty set
                      sql = "1=0"
                    end
                  when "!"
                    if value.any?
                      sql = "(#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} NOT IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + "))"
                    else
                      # NOT IN an empty set
                      sql = "1=1"
                    end
                  when "!*"
                    sql = "#{db_table}.#{db_field} IS NULL"
                    sql << " OR #{db_table}.#{db_field} = ''" if is_custom_filter
                  when "*"
                    sql = "#{db_table}.#{db_field} IS NOT NULL"
                    sql << " AND #{db_table}.#{db_field} <> ''" if is_custom_filter
                  when ">="
                    if [:date, :date_past].include?(type_for(field))
                      sql = date_clause(db_table, db_field, (Date.parse(value.first) rescue nil), nil)
                    else
                      if is_custom_filter
                        sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) >= #{value.first.to_f})"
                      else
                        sql = "#{db_table}.#{db_field} >= #{value.first.to_f}"
                      end
                    end
                  when "<="
                    if [:date, :date_past].include?(type_for(field))
                      sql = date_clause(db_table, db_field, nil, (Date.parse(value.first) rescue nil))
                    else
                      if is_custom_filter
                        sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) <= #{value.first.to_f})"
                      else
                        sql = "#{db_table}.#{db_field} <= #{value.first.to_f}"
                      end
                    end
                  when "><"
                    if [:date, :date_past].include?(type_for(field))
                      sql = date_clause(db_table, db_field, (Date.parse(value[0]) rescue nil), (Date.parse(value[1]) rescue nil))
                    else
                      if is_custom_filter
                        sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) BETWEEN #{value[0].to_f} AND #{value[1].to_f})"
                      else
                        sql = "#{db_table}.#{db_field} BETWEEN #{value[0].to_f} AND #{value[1].to_f}"
                      end
                    end
                  when "o"
                    sql = "#{queried_table_name}.status_id IN (SELECT id FROM #{IssueStatus.table_name} WHERE is_closed=#{connection.quoted_false})" if field == "status_id"
                  when "c"
                    sql = "#{queried_table_name}.status_id IN (SELECT id FROM #{IssueStatus.table_name} WHERE is_closed=#{connection.quoted_true})" if field == "status_id"
                  when "><t-"
                    # between today - n days and today
                    sql = relative_date_clause(db_table, db_field, - value.first.to_i, 0)
                  when ">t-"
                    # >= today - n days
                    sql = relative_date_clause(db_table, db_field, - value.first.to_i, nil)
                  when "<t-"
                    # <= today - n days
                    sql = relative_date_clause(db_table, db_field, nil, - value.first.to_i)
                  when "t-"
                    # = n days in past
                    sql = relative_date_clause(db_table, db_field, - value.first.to_i, - value.first.to_i)
                  when "><t+"
                    # between today and today + n days
                    sql = relative_date_clause(db_table, db_field, 0, value.first.to_i)
                  when ">t+"
                    # >= today + n days
                    sql = relative_date_clause(db_table, db_field, value.first.to_i, nil)
                  when "<t+"
                    # <= today + n days
                    sql = relative_date_clause(db_table, db_field, nil, value.first.to_i)
                  when "t+"
                    # = today + n days
                    sql = relative_date_clause(db_table, db_field, value.first.to_i, value.first.to_i)
                  when "t"
                    # = today
                    sql = relative_date_clause(db_table, db_field, 0, 0)
                  when "ld"
                    # = yesterday
                    sql = relative_date_clause(db_table, db_field, -1, -1)
                  when "w"
                    # = this week
                    first_day_of_week = l(:general_first_day_of_week).to_i
                    day_of_week = Date.today.cwday
                    days_ago = (day_of_week >= first_day_of_week ? day_of_week - first_day_of_week : day_of_week + 7 - first_day_of_week)
                    sql = relative_date_clause(db_table, db_field, - days_ago, - days_ago + 6)
                  when "lw"
                    # = last week
                    first_day_of_week = l(:general_first_day_of_week).to_i
                    day_of_week = Date.today.cwday
                    days_ago = (day_of_week >= first_day_of_week ? day_of_week - first_day_of_week : day_of_week + 7 - first_day_of_week)
                    sql = relative_date_clause(db_table, db_field, - days_ago - 7, - days_ago - 1)
                  when "l2w"
                    # = last 2 weeks
                    first_day_of_week = l(:general_first_day_of_week).to_i
                    day_of_week = Date.today.cwday
                    days_ago = (day_of_week >= first_day_of_week ? day_of_week - first_day_of_week : day_of_week + 7 - first_day_of_week)
                    sql = relative_date_clause(db_table, db_field, - days_ago - 14, - days_ago - 1)
                  when "m"
                    # = this month
                    date = Date.today
                    sql = date_clause(db_table, db_field, date.beginning_of_month, date.end_of_month)
                  when "lm"
                    # = last month
                    date = Date.today.prev_month
                    sql = date_clause(db_table, db_field, date.beginning_of_month, date.end_of_month)
                  when "y"
                    # = this year
                    date = Date.today
                    sql = date_clause(db_table, db_field, date.beginning_of_year, date.end_of_year)
                  when "~"
                    sql = "LOWER(#{db_table}.#{db_field}) LIKE '%#{connection.quote_string(value.first.to_s.downcase)}%'"
                  when "!~"
                    sql = "LOWER(#{db_table}.#{db_field}) NOT LIKE '%#{connection.quote_string(value.first.to_s.downcase)}%'"
                  else
                    raise "Unknown query operator #{operator}"
                  end
                  return sql
                end
                def add_custom_fields_filters(custom_fields, assoc=nil)
                  return unless custom_fields.present?
                  custom_fields.select(&:is_filter?).sort.each do |field|
                    case field.field_format
                    when "text"
                      options = { :type => :text }
                    when "list"
                      options = { :type => :list_optional, :values => field.possible_values }
                    when "date"
                      options = { :type => :date }
                    when "bool"
                      options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]] }
                    when "int"
                      options = { :type => :integer }
                    when "float"
                      options = { :type => :float }
                    when "user", "version"
                      next unless project
                      values = field.possible_values_options(project)
                      if User.current.logged? && field.field_format == 'user'
                        values.unshift ["<< #{l(:label_me)} >>", "me"]
                      end
                      options = { :type => :list_optional, :values => values }
                    else
                      options = { :type => :string }
                    end
                    filter_id = "cf_#{field.id}"
                    filter_name = field.name
                    if assoc.present?
                      filter_id = "#{assoc}.#{filter_id}"
                      filter_name = l("label_attribute_of_#{assoc}", :name => filter_name)
                    end
                    add_available_filter filter_id, options.merge({
                             :name => filter_name,
                             :format => field.field_format,
                             :field => field
                           })
                  end
                end
                def add_associations_custom_fields_filters(*associations)
                  fields_by_class = CustomField.where(:is_filter => true).group_by(&:class)
                  associations.each do |assoc|
                    association_klass = queried_class.reflect_on_association(assoc).klass
                    fields_by_class.each do |field_class, fields|
                      if field_class.customized_class <= association_klass
                        add_custom_fields_filters(fields, assoc)
                      end
                    end
                  end
                end
                # Returns a SQL clause for a date or datetime field.
                def date_clause(table, field, from, to)
                  s = []
                  if from
                    from_yesterday = from - 1
                    from_yesterday_time = Time.local(from_yesterday.year, from_yesterday.month, from_yesterday.day)
                    if self.class.default_timezone == :utc
                      from_yesterday_time = from_yesterday_time.utc
                    end
                    s << ("#{table}.#{field} > '%s'" % [connection.quoted_date(from_yesterday_time.end_of_day)])
                  end
                  if to
                    to_time = Time.local(to.year, to.month, to.day)
                    if self.class.default_timezone == :utc
                      to_time = to_time.utc
                    end
                    s << ("#{table}.#{field} <= '%s'" % [connection.quoted_date(to_time.end_of_day)])
                  end
                  s.join(' AND ')
                end
                # Returns a SQL clause for a date or datetime field using relative dates.
                def relative_date_clause(table, field, days_from, days_to)
                  date_clause(table, field, (days_from ? Date.today + days_from : nil), (days_to ? Date.today + days_to : nil))
                end
                # Additional joins required for the given sort options
                def joins_for_order_statement(order_options)
                  joins = []
                  if order_options
                    if order_options.include?('authors')
                      joins << "LEFT OUTER JOIN #{User.table_name} authors ON authors.id = #{queried_table_name}.author_id"
                    end
                    order_options.scan(/cf_\d+/).uniq.each do |name|
                      column = available_columns.detect {|c| c.name.to_s == name}
                      join = column && column.custom_field.join_for_order_statement
                      if join
                        joins << join
                      end
                    end
                  end
                  joins.any? ? joins.join(' ') : nil
                end
              end

app/views/issues/_list.html.erb +1 -3

              <%= form_tag({}) do -%>
              <%= hidden_field_tag 'back_url', url_for(params), :id => nil %>
              <div class="autoscroll">
              <table class="list issues">
                <thead>
                  <tr>
                    <th class="checkbox hide-when-print">
                      <%= link_to image_tag('toggle_check.png'), {},
                                            :onclick => 'toggleIssuesSelection(this); return false;',
                                            :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
                    </th>
-                   <%= sort_header_tag('id', :caption => '#', :default_order => 'desc') %>
                    <% query.inline_columns.each do |column| %>
                      <%= column_header(column) %>
                    <% end %>
                  </tr>
                </thead>
                <% previous_group = false %>
                <tbody>
                <% issue_list(issues) do |issue, level| -%>
                <% if @query.grouped? && (group = @query.group_by_column.value(issue)) != previous_group %>
                  <% reset_cycle %>
                  <tr class="group open">
                    <td colspan="<%= query.inline_columns.size + 2 %>">
                      <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
                      <%= group.blank? ? l(:label_none) : column_content(@query.group_by_column, issue) %> <span class="count"><%= @issue_count_by_group[group] %></span>
                      <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}",
                                           "toggleAllRowGroups(this)", :class => 'toggle-all') %>
                    </td>
                  </tr>
                  <% previous_group = group %>
                <% end %>
                <tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
                  <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td>
-                 <td class="id"><%= link_to issue.id, issue_path(issue) %></td>
                  <%= raw query.inline_columns.map {|column| "<td class=\"#{column.css_classes}\">#{column_content(column, issue)}</td>"}.join %>
                </tr>
                <% @query.block_columns.each do |column|
                     if (text = column_content(column, issue)) && text.present? -%>
                <tr class="<%= current_cycle %>">
-                 <td colspan="<%= @query.inline_columns.size + 2 %>" class="<%= column.css_classes %>"><%= text %></td>
+                 <td colspan="<%= @query.inline_columns.size + 1 %>" class="<%= column.css_classes %>"><%= text %></td>
                </tr>
                <% end -%>
                <% end -%>
                <% end -%>
                </tbody>
              </table>
              </div>
              <% end -%>

app/views/queries/_columns.html.erb +2 -2

              <table class="query-columns">
                <tr>
                  <td style="padding-left:0">
                    <%= label_tag "available_columns", l(:description_available_columns) %>
                    <br />
                    <%= select_tag 'available_columns',
-                           options_for_select((query.available_inline_columns - query.columns).collect {|column| [column.caption, column.name]}),
+                           options_for_select((query.available_inline_columns - query.columns).reject(&:frozen?).collect {|column| [column.caption, column.name]}),
                            :multiple => true, :size => 10, :style => "width:150px",
                            :ondblclick => "moveOptions(this.form.available_columns, this.form.selected_columns);" %>
                  </td>
                  <td class="buttons">
                    <input type="button" value="&#8594;"
                     onclick="moveOptions(this.form.available_columns, this.form.selected_columns);" /><br />
                    <input type="button" value="&#8592;"
                     onclick="moveOptions(this.form.selected_columns, this.form.available_columns);" />
                  </td>
                  <td>
                    <%= label_tag "selected_columns", l(:description_selected_columns) %>
                    <br />
                    <%= select_tag((defined?(tag_name) ? tag_name : 'c[]'),
-                           options_for_select(query.inline_columns.collect {|column| [column.caption, column.name]}),
+                           options_for_select((query.inline_columns & query.available_inline_columns).reject(&:frozen?).collect {|column| [column.caption, column.name]}),
                            :id => 'selected_columns', :multiple => true, :size => 10, :style => "width:150px",
                            :ondblclick => "moveOptions(this.form.selected_columns, this.form.available_columns);") %>
                  </td>
                  <td class="buttons">
                    <input type="button" value="&#8593;" onclick="moveOptionUp(this.form.selected_columns);" /><br />
                    <input type="button" value="&#8595;" onclick="moveOptionDown(this.form.selected_columns);" />
                  </td>
                </tr>
              </table>
              <% content_for :header_tags do %>
              <%= javascript_include_tag 'select_list_move' %>
              <% 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

test/functional/queries_controller_test.rb +1 -1

              # Redmine - project management software
              # Copyright (C) 2006-2013  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.
              require File.expand_path('../../test_helper', __FILE__)
              class QueriesControllerTest < ActionController::TestCase
                fixtures :projects, :users, :members, :member_roles, :roles, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :queries, :enabled_modules
                def setup
                  User.current = nil
                end
                def test_index
                  get :index
                  # HTML response not implemented
                  assert_response 406
                end
                def test_new_project_query
                  @request.session[:user_id] = 2
                  get :new, :project_id => 1
                  assert_response :success
                  assert_template 'new'
                  assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                               :name => 'query[is_public]',
                                                               :checked => nil }
                  assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                               :name => 'query_is_for_all',
                                                               :checked => nil,
                                                               :disabled => nil }
                  assert_select 'select[name=?]', 'c[]' do
                    assert_select 'option[value=tracker]'
                    assert_select 'option[value=subject]'
                  end
                end
                def test_new_global_query
                  @request.session[:user_id] = 2
                  get :new
                  assert_response :success
                  assert_template 'new'
                  assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                                  :name => 'query[is_public]' }
                  assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                               :name => 'query_is_for_all',
                                                               :checked => 'checked',
                                                               :disabled => nil }
                end
                def test_new_on_invalid_project
                  @request.session[:user_id] = 2
                  get :new, :project_id => 'invalid'
                  assert_response 404
                end
                def test_create_project_public_query
                  @request.session[:user_id] = 2
                  post :create,
                       :project_id => 'ecookbook',
                       :default_columns => '1',
                       :f => ["status_id", "assigned_to_id"],
                       :op => {"assigned_to_id" => "=", "status_id" => "o"},
                       :v => { "assigned_to_id" => ["1"], "status_id" => ["1"]},
                       :query => {"name" => "test_new_project_public_query", "is_public" => "1"}
                  q = Query.find_by_name('test_new_project_public_query')
                  assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook', :query_id => q
                  assert q.is_public?
                  assert q.has_default_columns?
                  assert q.valid?
                end
                def test_create_project_private_query
                  @request.session[:user_id] = 3
                  post :create,
                       :project_id => 'ecookbook',
                       :default_columns => '1',
                       :fields => ["status_id", "assigned_to_id"],
                       :operators => {"assigned_to_id" => "=", "status_id" => "o"},
                       :values => { "assigned_to_id" => ["1"], "status_id" => ["1"]},
                       :query => {"name" => "test_new_project_private_query", "is_public" => "1"}
                  q = Query.find_by_name('test_new_project_private_query')
                  assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook', :query_id => q
                  assert !q.is_public?
                  assert q.has_default_columns?
                  assert q.valid?
                end
                def test_create_global_private_query_with_custom_columns
                  @request.session[:user_id] = 3
                  post :create,
                       :fields => ["status_id", "assigned_to_id"],
                       :operators => {"assigned_to_id" => "=", "status_id" => "o"},
                       :values => { "assigned_to_id" => ["me"], "status_id" => ["1"]},
                       :query => {"name" => "test_new_global_private_query", "is_public" => "1"},
                       :c => ["", "tracker", "subject", "priority", "category"]
                  q = Query.find_by_name('test_new_global_private_query')
                  assert_redirected_to :controller => 'issues', :action => 'index', :project_id => nil, :query_id => q
                  assert !q.is_public?
                  assert !q.has_default_columns?
-                 assert_equal [:tracker, :subject, :priority, :category], q.columns.collect {|c| c.name}
+                 assert_equal [:id, :tracker, :subject, :priority, :category], q.columns.collect {|c| c.name}
                  assert q.valid?
                end
                def test_create_global_query_with_custom_filters
                  @request.session[:user_id] = 3
                  post :create,
                       :fields => ["assigned_to_id"],
                       :operators => {"assigned_to_id" => "="},
                       :values => { "assigned_to_id" => ["me"]},
                       :query => {"name" => "test_new_global_query"}
                  q = Query.find_by_name('test_new_global_query')
                  assert_redirected_to :controller => 'issues', :action => 'index', :project_id => nil, :query_id => q
                  assert !q.has_filter?(:status_id)
                  assert_equal ['assigned_to_id'], q.filters.keys
                  assert q.valid?
                end
                def test_create_with_sort
                  @request.session[:user_id] = 1
                  post :create,
                       :default_columns => '1',
                       :operators => {"status_id" => "o"},
                       :values => {"status_id" => ["1"]},
                       :query => {:name => "test_new_with_sort",
                                  :is_public => "1",
                                  :sort_criteria => {"0" => ["due_date", "desc"], "1" => ["tracker", ""]}}
                  query = Query.find_by_name("test_new_with_sort")
                  assert_not_nil query
                  assert_equal [['due_date', 'desc'], ['tracker', 'asc']], query.sort_criteria
                end
                def test_create_with_failure
                  @request.session[:user_id] = 2
                  assert_no_difference '::Query.count' do
                    post :create, :project_id => 'ecookbook', :query => {:name => ''}
                  end
                  assert_response :success
                  assert_template 'new'
                  assert_select 'input[name=?]', 'query[name]'
                end
                def test_edit_global_public_query
                  @request.session[:user_id] = 1
                  get :edit, :id => 4
                  assert_response :success
                  assert_template 'edit'
                  assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                               :name => 'query[is_public]',
                                                               :checked => 'checked' }
                  assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                               :name => 'query_is_for_all',
                                                               :checked => 'checked',
                                                               :disabled => 'disabled' }
                end
                def test_edit_global_private_query
                  @request.session[:user_id] = 3
                  get :edit, :id => 3
                  assert_response :success
                  assert_template 'edit'
                  assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                                  :name => 'query[is_public]' }
                  assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                               :name => 'query_is_for_all',
                                                               :checked => 'checked',
                                                               :disabled => 'disabled' }
                end
                def test_edit_project_private_query
                  @request.session[:user_id] = 3
                  get :edit, :id => 2
                  assert_response :success
                  assert_template 'edit'
                  assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                                  :name => 'query[is_public]' }
                  assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                               :name => 'query_is_for_all',
                                                               :checked => nil,
                                                               :disabled => nil }
                end
                def test_edit_project_public_query
                  @request.session[:user_id] = 2
                  get :edit, :id => 1
                  assert_response :success
                  assert_template 'edit'
                  assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                               :name => 'query[is_public]',
                                                               :checked => 'checked'
                                                                }
                  assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                               :name => 'query_is_for_all',
                                                               :checked => nil,
                                                               :disabled => 'disabled' }
                end
                def test_edit_sort_criteria
                  @request.session[:user_id] = 1
                  get :edit, :id => 5
                  assert_response :success
                  assert_template 'edit'
                  assert_tag :tag => 'select', :attributes => { :name => 'query[sort_criteria][0][]' },
                                               :child => { :tag => 'option', :attributes => { :value => 'priority',
                                                                                              :selected => 'selected' } }
                  assert_tag :tag => 'select', :attributes => { :name => 'query[sort_criteria][0][]' },
                                               :child => { :tag => 'option', :attributes => { :value => 'desc',
                                                                                              :selected => 'selected' } }
                end
                def test_edit_invalid_query
                  @request.session[:user_id] = 2
                  get :edit, :id => 99
                  assert_response 404
                end
                def test_udpate_global_private_query
                  @request.session[:user_id] = 3
                  put :update,
                       :id => 3,
                       :default_columns => '1',
                       :fields => ["status_id", "assigned_to_id"],
                       :operators => {"assigned_to_id" => "=", "status_id" => "o"},
                       :values => { "assigned_to_id" => ["me"], "status_id" => ["1"]},
                       :query => {"name" => "test_edit_global_private_query", "is_public" => "1"}
                  assert_redirected_to :controller => 'issues', :action => 'index', :query_id => 3
                  q = Query.find_by_name('test_edit_global_private_query')
                  assert !q.is_public?
                  assert q.has_default_columns?
                  assert q.valid?
                end
                def test_update_global_public_query
                  @request.session[:user_id] = 1
                  put :update,
                       :id => 4,
                       :default_columns => '1',
                       :fields => ["status_id", "assigned_to_id"],
                       :operators => {"assigned_to_id" => "=", "status_id" => "o"},
                       :values => { "assigned_to_id" => ["1"], "status_id" => ["1"]},
                       :query => {"name" => "test_edit_global_public_query", "is_public" => "1"}
                  assert_redirected_to :controller => 'issues', :action => 'index', :query_id => 4
                  q = Query.find_by_name('test_edit_global_public_query')
                  assert q.is_public?
                  assert q.has_default_columns?
                  assert q.valid?
                end
                def test_update_with_failure
                  @request.session[:user_id] = 1
                  put :update, :id => 4, :query => {:name => ''}
                  assert_response :success
                  assert_template 'edit'
                end
                def test_destroy
                  @request.session[:user_id] = 2
                  delete :destroy, :id => 1
                  assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook', :set_filter => 1, :query_id => nil
                  assert_nil Query.find_by_id(1)
                end
                def test_backslash_should_be_escaped_in_filters
                  @request.session[:user_id] = 2
                  get :new, :subject => 'foo/bar'
                  assert_response :success
                  assert_template 'new'
                  assert_include 'addFilter("subject", "=", ["foo\/bar"]);', response.body
                end
              end

test/unit/query_test.rb +22 -4

              # Redmine - project management software
              # Copyright (C) 2006-2013  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.
              require File.expand_path('../../test_helper', __FILE__)
              class QueryTest < ActiveSupport::TestCase
                include Redmine::I18n
                fixtures :projects, :enabled_modules, :users, :members,
                         :member_roles, :roles, :trackers, :issue_statuses,
                         :issue_categories, :enumerations, :issues,
                         :watchers, :custom_fields, :custom_values, :versions,
                         :queries,
                         :projects_trackers,
                         :custom_fields_trackers
                def test_available_filters_should_be_ordered
                  query = IssueQuery.new
                  assert_equal 0, query.available_filters.keys.index('status_id')
                end
                def test_custom_fields_for_all_projects_should_be_available_in_global_queries
                  query = IssueQuery.new(:project => nil, :name => '_')
                  assert query.available_filters.has_key?('cf_1')
                  assert !query.available_filters.has_key?('cf_3')
                end
                def test_system_shared_versions_should_be_available_in_global_queries
                  Version.find(2).update_attribute :sharing, 'system'
                  query = IssueQuery.new(:project => nil, :name => '_')
                  assert query.available_filters.has_key?('fixed_version_id')
                  assert query.available_filters['fixed_version_id'][:values].detect {|v| v.last == '2'}
                end
                def test_project_filter_in_global_queries
                  query = IssueQuery.new(:project => nil, :name => '_')
                  project_filter = query.available_filters["project_id"]
                  assert_not_nil project_filter
                  project_ids = project_filter[:values].map{|p| p[1]}
                  assert project_ids.include?("1")  #public project
                  assert !project_ids.include?("2") #private project user cannot see
                end
                def find_issues_with_query(query)
                  Issue.includes([:assigned_to, :status, :tracker, :project, :priority]).where(
                       query.statement
                     ).all
                end
                def assert_find_issues_with_query_is_successful(query)
                  assert_nothing_raised do
                    find_issues_with_query(query)
                  end
                end
                def assert_query_statement_includes(query, condition)
                  assert_include condition, query.statement
                end
                def assert_query_result(expected, query)
                  assert_nothing_raised do
                    assert_equal expected.map(&:id).sort, query.issues.map(&:id).sort
                    assert_equal expected.size, query.issue_count
                  end
                end
                def test_query_should_allow_shared_versions_for_a_project_query
                  subproject_version = Version.find(4)
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('fixed_version_id', '=', [subproject_version.id.to_s])
                  assert query.statement.include?("#{Issue.table_name}.fixed_version_id IN ('4')")
                end
                def test_query_with_multiple_custom_fields
                  query = IssueQuery.find(1)
                  assert query.valid?
                  assert query.statement.include?("#{CustomValue.table_name}.value IN ('MySQL')")
                  issues = find_issues_with_query(query)
                  assert_equal 1, issues.length
                  assert_equal Issue.find(3), issues.first
                end
                def test_operator_none
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('fixed_version_id', '!*', [''])
                  query.add_filter('cf_1', '!*', [''])
                  assert query.statement.include?("#{Issue.table_name}.fixed_version_id IS NULL")
                  assert query.statement.include?("#{CustomValue.table_name}.value IS NULL OR #{CustomValue.table_name}.value = ''")
                  find_issues_with_query(query)
                end
                def test_operator_none_for_integer
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('estimated_hours', '!*', [''])
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  assert issues.all? {|i| !i.estimated_hours}
                end
                def test_operator_none_for_date
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('start_date', '!*', [''])
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  assert issues.all? {|i| i.start_date.nil?}
                end
                def test_operator_none_for_string_custom_field
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('cf_2', '!*', [''])
                  assert query.has_filter?('cf_2')
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  assert issues.all? {|i| i.custom_field_value(2).blank?}
                end
                def test_operator_all
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('fixed_version_id', '*', [''])
                  query.add_filter('cf_1', '*', [''])
                  assert query.statement.include?("#{Issue.table_name}.fixed_version_id IS NOT NULL")
                  assert query.statement.include?("#{CustomValue.table_name}.value IS NOT NULL AND #{CustomValue.table_name}.value <> ''")
                  find_issues_with_query(query)
                end
                def test_operator_all_for_date
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('start_date', '*', [''])
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  assert issues.all? {|i| i.start_date.present?}
                end
                def test_operator_all_for_string_custom_field
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('cf_2', '*', [''])
                  assert query.has_filter?('cf_2')
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  assert issues.all? {|i| i.custom_field_value(2).present?}
                end
                def test_numeric_filter_should_not_accept_non_numeric_values
                  query = IssueQuery.new(:name => '_')
                  query.add_filter('estimated_hours', '=', ['a'])
                  assert query.has_filter?('estimated_hours')
                  assert !query.valid?
                end
                def test_operator_is_on_float
                  Issue.update_all("estimated_hours = 171.2", "id=2")
                  query = IssueQuery.new(:name => '_')
                  query.add_filter('estimated_hours', '=', ['171.20'])
                  issues = find_issues_with_query(query)
                  assert_equal 1, issues.size
                  assert_equal 2, issues.first.id
                end
                def test_operator_is_on_integer_custom_field
                  f = IssueCustomField.create!(:name => 'filter', :field_format => 'int', :is_for_all => true, :is_filter => true)
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => '7')
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(2), :value => '12')
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => '')
                  query = IssueQuery.new(:name => '_')
                  query.add_filter("cf_#{f.id}", '=', ['12'])
                  issues = find_issues_with_query(query)
                  assert_equal 1, issues.size
                  assert_equal 2, issues.first.id
                end
                def test_operator_is_on_integer_custom_field_should_accept_negative_value
                  f = IssueCustomField.create!(:name => 'filter', :field_format => 'int', :is_for_all => true, :is_filter => true)
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => '7')
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(2), :value => '-12')
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => '')
                  query = IssueQuery.new(:name => '_')
                  query.add_filter("cf_#{f.id}", '=', ['-12'])
                  assert query.valid?
                  issues = find_issues_with_query(query)
                  assert_equal 1, issues.size
                  assert_equal 2, issues.first.id
                end
                def test_operator_is_on_float_custom_field
                  f = IssueCustomField.create!(:name => 'filter', :field_format => 'float', :is_filter => true, :is_for_all => true)
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => '7.3')
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(2), :value => '12.7')
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => '')
                  query = IssueQuery.new(:name => '_')
                  query.add_filter("cf_#{f.id}", '=', ['12.7'])
                  issues = find_issues_with_query(query)
                  assert_equal 1, issues.size
                  assert_equal 2, issues.first.id
                end
                def test_operator_is_on_float_custom_field_should_accept_negative_value
                  f = IssueCustomField.create!(:name => 'filter', :field_format => 'float', :is_filter => true, :is_for_all => true)
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => '7.3')
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(2), :value => '-12.7')
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => '')
                  query = IssueQuery.new(:name => '_')
                  query.add_filter("cf_#{f.id}", '=', ['-12.7'])
                  assert query.valid?
                  issues = find_issues_with_query(query)
                  assert_equal 1, issues.size
                  assert_equal 2, issues.first.id
                end
                def test_operator_is_on_multi_list_custom_field
                  f = IssueCustomField.create!(:name => 'filter', :field_format => 'list', :is_filter => true, :is_for_all => true,
                    :possible_values => ['value1', 'value2', 'value3'], :multiple => true)
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => 'value1')
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => 'value2')
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => 'value1')
                  query = IssueQuery.new(:name => '_')
                  query.add_filter("cf_#{f.id}", '=', ['value1'])
                  issues = find_issues_with_query(query)
                  assert_equal [1, 3], issues.map(&:id).sort
                  query = IssueQuery.new(:name => '_')
                  query.add_filter("cf_#{f.id}", '=', ['value2'])
                  issues = find_issues_with_query(query)
                  assert_equal [1], issues.map(&:id).sort
                end
                def test_operator_is_not_on_multi_list_custom_field
                  f = IssueCustomField.create!(:name => 'filter', :field_format => 'list', :is_filter => true, :is_for_all => true,
                    :possible_values => ['value1', 'value2', 'value3'], :multiple => true)
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => 'value1')
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => 'value2')
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => 'value1')
                  query = IssueQuery.new(:name => '_')
                  query.add_filter("cf_#{f.id}", '!', ['value1'])
                  issues = find_issues_with_query(query)
                  assert !issues.map(&:id).include?(1)
                  assert !issues.map(&:id).include?(3)
                  query = IssueQuery.new(:name => '_')
                  query.add_filter("cf_#{f.id}", '!', ['value2'])
                  issues = find_issues_with_query(query)
                  assert !issues.map(&:id).include?(1)
                  assert issues.map(&:id).include?(3)
                end
                def test_operator_is_on_is_private_field
                  # is_private filter only available for those who can set issues private
                  User.current = User.find(2)
                  query = IssueQuery.new(:name => '_')
                  assert query.available_filters.key?('is_private')
                  query.add_filter("is_private", '=', ['1'])
                  issues = find_issues_with_query(query)
                  assert issues.any?
                  assert_nil issues.detect {|issue| !issue.is_private?}
                ensure
                  User.current = nil
                end
                def test_operator_is_not_on_is_private_field
                  # is_private filter only available for those who can set issues private
                  User.current = User.find(2)
                  query = IssueQuery.new(:name => '_')
                  assert query.available_filters.key?('is_private')
                  query.add_filter("is_private", '!', ['1'])
                  issues = find_issues_with_query(query)
                  assert issues.any?
                  assert_nil issues.detect {|issue| issue.is_private?}
                ensure
                  User.current = nil
                end
                def test_operator_greater_than
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('done_ratio', '>=', ['40'])
                  assert query.statement.include?("#{Issue.table_name}.done_ratio >= 40.0")
                  find_issues_with_query(query)
                end
                def test_operator_greater_than_a_float
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('estimated_hours', '>=', ['40.5'])
                  assert query.statement.include?("#{Issue.table_name}.estimated_hours >= 40.5")
                  find_issues_with_query(query)
                end
                def test_operator_greater_than_on_int_custom_field
                  f = IssueCustomField.create!(:name => 'filter', :field_format => 'int', :is_filter => true, :is_for_all => true)
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => '7')
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(2), :value => '12')
                  CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => '')
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter("cf_#{f.id}", '>=', ['8'])
                  issues = find_issues_with_query(query)
                  assert_equal 1, issues.size
                  assert_equal 2, issues.first.id
                end
                def test_operator_lesser_than
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('done_ratio', '<=', ['30'])
                  assert query.statement.include?("#{Issue.table_name}.done_ratio <= 30.0")
                  find_issues_with_query(query)
                end
                def test_operator_lesser_than_on_custom_field
                  f = IssueCustomField.create!(:name => 'filter', :field_format => 'int', :is_filter => true, :is_for_all => true)
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter("cf_#{f.id}", '<=', ['30'])
                  assert_match /CAST.+ <= 30\.0/, query.statement
                  find_issues_with_query(query)
                end
                def test_operator_between
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('done_ratio', '><', ['30', '40'])
                  assert_include "#{Issue.table_name}.done_ratio BETWEEN 30.0 AND 40.0", query.statement
                  find_issues_with_query(query)
                end
                def test_operator_between_on_custom_field
                  f = IssueCustomField.create!(:name => 'filter', :field_format => 'int', :is_filter => true, :is_for_all => true)
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter("cf_#{f.id}", '><', ['30', '40'])
                  assert_match /CAST.+ BETWEEN 30.0 AND 40.0/, query.statement
                  find_issues_with_query(query)
                end
                def test_date_filter_should_not_accept_non_date_values
                  query = IssueQuery.new(:name => '_')
                  query.add_filter('created_on', '=', ['a'])
                  assert query.has_filter?('created_on')
                  assert !query.valid?
                end
                def test_date_filter_should_not_accept_invalid_date_values
                  query = IssueQuery.new(:name => '_')
                  query.add_filter('created_on', '=', ['2011-01-34'])
                  assert query.has_filter?('created_on')
                  assert !query.valid?
                end
                def test_relative_date_filter_should_not_accept_non_integer_values
                  query = IssueQuery.new(:name => '_')
                  query.add_filter('created_on', '>t-', ['a'])
                  assert query.has_filter?('created_on')
                  assert !query.valid?
                end
                def test_operator_date_equals
                  query = IssueQuery.new(:name => '_')
                  query.add_filter('due_date', '=', ['2011-07-10'])
                  assert_match /issues\.due_date > '2011-07-09 23:59:59(\.9+)?' AND issues\.due_date <= '2011-07-10 23:59:59(\.9+)?/, query.statement
                  find_issues_with_query(query)
                end
                def test_operator_date_lesser_than
                  query = IssueQuery.new(:name => '_')
                  query.add_filter('due_date', '<=', ['2011-07-10'])
                  assert_match /issues\.due_date <= '2011-07-10 23:59:59(\.9+)?/, query.statement
                  find_issues_with_query(query)
                end
                def test_operator_date_greater_than
                  query = IssueQuery.new(:name => '_')
                  query.add_filter('due_date', '>=', ['2011-07-10'])
                  assert_match /issues\.due_date > '2011-07-09 23:59:59(\.9+)?'/, query.statement
                  find_issues_with_query(query)
                end
                def test_operator_date_between
                  query = IssueQuery.new(:name => '_')
                  query.add_filter('due_date', '><', ['2011-06-23', '2011-07-10'])
                  assert_match /issues\.due_date > '2011-06-22 23:59:59(\.9+)?' AND issues\.due_date <= '2011-07-10 23:59:59(\.9+)?/, query.statement
                  find_issues_with_query(query)
                end
                def test_operator_in_more_than
                  Issue.find(7).update_attribute(:due_date, (Date.today + 15))
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', '>t+', ['15'])
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  issues.each {|issue| assert(issue.due_date >= (Date.today + 15))}
                end
                def test_operator_in_less_than
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', '<t+', ['15'])
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  issues.each {|issue| assert(issue.due_date <= (Date.today + 15))}
                end
                def test_operator_in_the_next_days
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', '><t+', ['15'])
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  issues.each {|issue| assert(issue.due_date >= Date.today && issue.due_date <= (Date.today + 15))}
                end
                def test_operator_less_than_ago
                  Issue.find(7).update_attribute(:due_date, (Date.today - 3))
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', '>t-', ['3'])
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  issues.each {|issue| assert(issue.due_date >= (Date.today - 3))}
                end
                def test_operator_in_the_past_days
                  Issue.find(7).update_attribute(:due_date, (Date.today - 3))
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', '><t-', ['3'])
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  issues.each {|issue| assert(issue.due_date >= (Date.today - 3) && issue.due_date <= Date.today)}
                end
                def test_operator_more_than_ago
                  Issue.find(7).update_attribute(:due_date, (Date.today - 10))
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', '<t-', ['10'])
                  assert query.statement.include?("#{Issue.table_name}.due_date <=")
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  issues.each {|issue| assert(issue.due_date <= (Date.today - 10))}
                end
                def test_operator_in
                  Issue.find(7).update_attribute(:due_date, (Date.today + 2))
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', 't+', ['2'])
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  issues.each {|issue| assert_equal((Date.today + 2), issue.due_date)}
                end
                def test_operator_ago
                  Issue.find(7).update_attribute(:due_date, (Date.today - 3))
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', 't-', ['3'])
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  issues.each {|issue| assert_equal((Date.today - 3), issue.due_date)}
                end
                def test_operator_today
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', 't', [''])
                  issues = find_issues_with_query(query)
                  assert !issues.empty?
                  issues.each {|issue| assert_equal Date.today, issue.due_date}
                end
                def test_operator_this_week_on_date
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', 'w', [''])
                  find_issues_with_query(query)
                end
                def test_operator_this_week_on_datetime
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('created_on', 'w', [''])
                  find_issues_with_query(query)
                end
                def test_operator_contains
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('subject', '~', ['uNable'])
                  assert query.statement.include?("LOWER(#{Issue.table_name}.subject) LIKE '%unable%'")
                  result = find_issues_with_query(query)
                  assert result.empty?
                  result.each {|issue| assert issue.subject.downcase.include?('unable') }
                end
                def test_range_for_this_week_with_week_starting_on_monday
                  I18n.locale = :fr
                  assert_equal '1', I18n.t(:general_first_day_of_week)
                  Date.stubs(:today).returns(Date.parse('2011-04-29'))
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', 'w', [''])
                  assert query.statement.match(/issues\.due_date > '2011-04-24 23:59:59(\.9+)?' AND issues\.due_date <= '2011-05-01 23:59:59(\.9+)?/), "range not found in #{query.statement}"
                  I18n.locale = :en
                end
                def test_range_for_this_week_with_week_starting_on_sunday
                  I18n.locale = :en
                  assert_equal '7', I18n.t(:general_first_day_of_week)
                  Date.stubs(:today).returns(Date.parse('2011-04-29'))
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('due_date', 'w', [''])
                  assert query.statement.match(/issues\.due_date > '2011-04-23 23:59:59(\.9+)?' AND issues\.due_date <= '2011-04-30 23:59:59(\.9+)?/), "range not found in #{query.statement}"
                end
                def test_operator_does_not_contains
                  query = IssueQuery.new(:project => Project.find(1), :name => '_')
                  query.add_filter('subject', '!~', ['uNable'])
                  assert query.statement.include?("LOWER(#{Issue.table_name}.subject) NOT LIKE '%unable%'")
                  find_issues_with_query(query)
                end
                def test_filter_assigned_to_me
                  user = User.find(2)
                  group = Group.find(10)
                  User.current = user
                  i1 = Issue.generate!(:project_id => 1, :tracker_id => 1, :assigned_to => user)
                  i2 = Issue.generate!(:project_id => 1, :tracker_id => 1, :assigned_to => group)
                  i3 = Issue.generate!(:project_id => 1, :tracker_id => 1, :assigned_to => Group.find(11))
                  group.users << user
                  query = IssueQuery.new(:name => '_', :filters => { 'assigned_to_id' => {:operator => '=', :values => ['me']}})
                  result = query.issues
                  assert_equal Issue.visible.all(:conditions => {:assigned_to_id => ([2] + user.reload.group_ids)}).sort_by(&:id), result.sort_by(&:id)
                  assert result.include?(i1)
                  assert result.include?(i2)
                  assert !result.include?(i3)
                end
                def test_user_custom_field_filtered_on_me
                  User.current = User.find(2)
                  cf = IssueCustomField.create!(:field_format => 'user', :is_for_all => true, :is_filter => true, :name => 'User custom field', :tracker_ids => [1])
                  issue1 = Issue.create!(:project_id => 1, :tracker_id => 1, :custom_field_values => {cf.id.to_s => '2'}, :subject => 'Test', :author_id => 1)
                  issue2 = Issue.generate!(:project_id => 1, :tracker_id => 1, :custom_field_values => {cf.id.to_s => '3'})
                  query = IssueQuery.new(:name => '_', :project => Project.find(1))
                  filter = query.available_filters["cf_#{cf.id}"]
                  assert_not_nil filter
                  assert_include 'me', filter[:values].map{|v| v[1]}
                  query.filters = { "cf_#{cf.id}" => {:operator => '=', :values => ['me']}}
                  result = query.issues
                  assert_equal 1, result.size
                  assert_equal issue1, result.first
                end
                def test_filter_my_projects
                  User.current = User.find(2)
                  query = IssueQuery.new(:name => '_')
                  filter = query.available_filters['project_id']
                  assert_not_nil filter
                  assert_include 'mine', filter[:values].map{|v| v[1]}
                  query.filters = { 'project_id' => {:operator => '=', :values => ['mine']}}
                  result = query.issues
                  assert_nil result.detect {|issue| !User.current.member_of?(issue.project)}
                end
                def test_filter_watched_issues
                  User.current = User.find(1)
                  query = IssueQuery.new(:name => '_', :filters => { 'watcher_id' => {:operator => '=', :values => ['me']}})
                  result = find_issues_with_query(query)
                  assert_not_nil result
                  assert !result.empty?
                  assert_equal Issue.visible.watched_by(User.current).sort_by(&:id), result.sort_by(&:id)
                  User.current = nil
                end
                def test_filter_unwatched_issues
                  User.current = User.find(1)
                  query = IssueQuery.new(:name => '_', :filters => { 'watcher_id' => {:operator => '!', :values => ['me']}})
                  result = find_issues_with_query(query)
                  assert_not_nil result
                  assert !result.empty?
                  assert_equal((Issue.visible - Issue.watched_by(User.current)).sort_by(&:id).size, result.sort_by(&:id).size)
                  User.current = nil
                end
                def test_filter_on_project_custom_field
                  field = ProjectCustomField.create!(:name => 'Client', :is_filter => true, :field_format => 'string')
                  CustomValue.create!(:custom_field => field, :customized => Project.find(3), :value => 'Foo')
                  CustomValue.create!(:custom_field => field, :customized => Project.find(5), :value => 'Foo')
                  query = IssueQuery.new(:name => '_')
                  filter_name = "project.cf_#{field.id}"
                  assert_include filter_name, query.available_filters.keys
                  query.filters = {filter_name => {:operator => '=', :values => ['Foo']}}
                  assert_equal [3, 5], find_issues_with_query(query).map(&:project_id).uniq.sort
                end
                def test_filter_on_author_custom_field
                  field = UserCustomField.create!(:name => 'Client', :is_filter => true, :field_format => 'string')
                  CustomValue.create!(:custom_field => field, :customized => User.find(3), :value => 'Foo')
                  query = IssueQuery.new(:name => '_')
                  filter_name = "author.cf_#{field.id}"
                  assert_include filter_name, query.available_filters.keys
                  query.filters = {filter_name => {:operator => '=', :values => ['Foo']}}
                  assert_equal [3], find_issues_with_query(query).map(&:author_id).uniq.sort
                end
                def test_filter_on_assigned_to_custom_field
                  field = UserCustomField.create!(:name => 'Client', :is_filter => true, :field_format => 'string')
                  CustomValue.create!(:custom_field => field, :customized => User.find(3), :value => 'Foo')
                  query = IssueQuery.new(:name => '_')
                  filter_name = "assigned_to.cf_#{field.id}"
                  assert_include filter_name, query.available_filters.keys
                  query.filters = {filter_name => {:operator => '=', :values => ['Foo']}}
                  assert_equal [3], find_issues_with_query(query).map(&:assigned_to_id).uniq.sort
                end
                def test_filter_on_fixed_version_custom_field
                  field = VersionCustomField.create!(:name => 'Client', :is_filter => true, :field_format => 'string')
                  CustomValue.create!(:custom_field => field, :customized => Version.find(2), :value => 'Foo')
                  query = IssueQuery.new(:name => '_')
                  filter_name = "fixed_version.cf_#{field.id}"
                  assert_include filter_name, query.available_filters.keys
                  query.filters = {filter_name => {:operator => '=', :values => ['Foo']}}
                  assert_equal [2], find_issues_with_query(query).map(&:fixed_version_id).uniq.sort
                end
                def test_filter_on_relations_with_a_specific_issue
                  IssueRelation.delete_all
                  IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Issue.find(2))
                  IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(3), :issue_to => Issue.find(1))
                  query = IssueQuery.new(:name => '_')
                  query.filters = {"relates" => {:operator => '=', :values => ['1']}}
                  assert_equal [2, 3], find_issues_with_query(query).map(&:id).sort
                  query = IssueQuery.new(:name => '_')
                  query.filters = {"relates" => {:operator => '=', :values => ['2']}}
                  assert_equal [1], find_issues_with_query(query).map(&:id).sort
                end
                def test_filter_on_relations_with_any_issues_in_a_project
                  IssueRelation.delete_all
                  with_settings :cross_project_issue_relations => '1' do
                    IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Project.find(2).issues.first)
                    IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(2), :issue_to => Project.find(2).issues.first)
                    IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Project.find(3).issues.first)
                  end
                  query = IssueQuery.new(:name => '_')
                  query.filters = {"relates" => {:operator => '=p', :values => ['2']}}
                  assert_equal [1, 2], find_issues_with_query(query).map(&:id).sort
                  query = IssueQuery.new(:name => '_')
                  query.filters = {"relates" => {:operator => '=p', :values => ['3']}}
                  assert_equal [1], find_issues_with_query(query).map(&:id).sort
                  query = IssueQuery.new(:name => '_')
                  query.filters = {"relates" => {:operator => '=p', :values => ['4']}}
                  assert_equal [], find_issues_with_query(query).map(&:id).sort
                end
                def test_filter_on_relations_with_any_issues_not_in_a_project
                  IssueRelation.delete_all
                  with_settings :cross_project_issue_relations => '1' do
                    IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Project.find(2).issues.first)
                    #IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(2), :issue_to => Project.find(1).issues.first)
                    IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Project.find(3).issues.first)
                  end
                  query = IssueQuery.new(:name => '_')
                  query.filters = {"relates" => {:operator => '=!p', :values => ['1']}}
                  assert_equal [1], find_issues_with_query(query).map(&:id).sort
                end
                def test_filter_on_relations_with_no_issues_in_a_project
                  IssueRelation.delete_all
                  with_settings :cross_project_issue_relations => '1' do
                    IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Project.find(2).issues.first)
                    IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(2), :issue_to => Project.find(3).issues.first)
                    IssueRelation.create!(:relation_type => "relates", :issue_to => Project.find(2).issues.first, :issue_from => Issue.find(3))
                  end
                  query = IssueQuery.new(:name => '_')
                  query.filters = {"relates" => {:operator => '!p', :values => ['2']}}
                  ids = find_issues_with_query(query).map(&:id).sort
                  assert_include 2, ids
                  assert_not_include 1, ids
                  assert_not_include 3, ids
                end
                def test_filter_on_relations_with_no_issues
                  IssueRelation.delete_all
                  IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Issue.find(2))
                  IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(3), :issue_to => Issue.find(1))
                  query = IssueQuery.new(:name => '_')
                  query.filters = {"relates" => {:operator => '!*', :values => ['']}}
                  ids = find_issues_with_query(query).map(&:id)
                  assert_equal [], ids & [1, 2, 3]
                  assert_include 4, ids
                end
                def test_filter_on_relations_with_any_issues
                  IssueRelation.delete_all
                  IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Issue.find(2))
                  IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(3), :issue_to => Issue.find(1))
                  query = IssueQuery.new(:name => '_')
                  query.filters = {"relates" => {:operator => '*', :values => ['']}}
                  assert_equal [1, 2, 3], find_issues_with_query(query).map(&:id).sort
                end
                def test_statement_should_be_nil_with_no_filters
                  q = IssueQuery.new(:name => '_')
                  q.filters = {}
                  assert q.valid?
                  assert_nil q.statement
                end
                def test_default_columns
                  q = IssueQuery.new
                  assert q.columns.any?
                  assert q.inline_columns.any?
                  assert q.block_columns.empty?
                end
                def test_set_column_names
                  q = IssueQuery.new
                  q.column_names = ['tracker', :subject, '', 'unknonw_column']
-                 assert_equal [:tracker, :subject], q.columns.collect {|c| c.name}
-                 c = q.columns.first
-                 assert q.has_column?(c)
+                 assert_equal [:id, :tracker, :subject], q.columns.collect {|c| c.name}
+               end
+               def test_has_column_should_accept_a_column_name
+                 q = IssueQuery.new
+                 q.column_names = ['tracker', :subject]
+                 assert q.has_column?(:tracker)
+                 assert !q.has_column?(:category)
+               end
+               def test_has_column_should_accept_a_column
+                 q = IssueQuery.new
+                 q.column_names = ['tracker', :subject]
+                 tracker_column = q.available_columns.detect {|c| c.name==:tracker}
+                 assert_kind_of QueryColumn, tracker_column
+                 category_column = q.available_columns.detect {|c| c.name==:category}
+                 assert_kind_of QueryColumn, category_column
+                 assert q.has_column?(tracker_column)
+                 assert !q.has_column?(category_column)
                end
                def test_inline_and_block_columns
                  q = IssueQuery.new
                  q.column_names = ['subject', 'description', 'tracker']
-                 assert_equal [:subject, :tracker], q.inline_columns.map(&:name)
+                 assert_equal [:id, :subject, :tracker], q.inline_columns.map(&:name)
                  assert_equal [:description], q.block_columns.map(&:name)
                end
                def test_custom_field_columns_should_be_inline
                  q = IssueQuery.new
                  columns = q.available_columns.select {|column| column.is_a? QueryCustomFieldColumn}
                  assert columns.any?
                  assert_nil columns.detect {|column| !column.inline?}
                end
                def test_query_should_preload_spent_hours
                  q = IssueQuery.new(:name => '_', :column_names => [:subject, :spent_hours])
                  assert q.has_column?(:spent_hours)
                  issues = q.issues
                  assert_not_nil issues.first.instance_variable_get("@spent_hours")
                end
                def test_groupable_columns_should_include_custom_fields
                  q = IssueQuery.new
                  column = q.groupable_columns.detect {|c| c.name == :cf_1}
                  assert_not_nil column
                  assert_kind_of QueryCustomFieldColumn, column
                end
                def test_groupable_columns_should_not_include_multi_custom_fields
                  field = CustomField.find(1)
                  field.update_attribute :multiple, true
                  q = IssueQuery.new
                  column = q.groupable_columns.detect {|c| c.name == :cf_1}
                  assert_nil column
                end
                def test_groupable_columns_should_include_user_custom_fields
                  cf = IssueCustomField.create!(:name => 'User', :is_for_all => true, :tracker_ids => [1], :field_format => 'user')
                  q = IssueQuery.new
                  assert q.groupable_columns.detect {|c| c.name == "cf_#{cf.id}".to_sym}
                end
                def test_groupable_columns_should_include_version_custom_fields
                  cf = IssueCustomField.create!(:name => 'User', :is_for_all => true, :tracker_ids => [1], :field_format => 'version')
                  q = IssueQuery.new
                  assert q.groupable_columns.detect {|c| c.name == "cf_#{cf.id}".to_sym}
                end
                def test_grouped_with_valid_column
                  q = IssueQuery.new(:group_by => 'status')
                  assert q.grouped?
                  assert_not_nil q.group_by_column
                  assert_equal :status, q.group_by_column.name
                  assert_not_nil q.group_by_statement
                  assert_equal 'status', q.group_by_statement
                end
                def test_grouped_with_invalid_column
                  q = IssueQuery.new(:group_by => 'foo')
                  assert !q.grouped?
                  assert_nil q.group_by_column
                  assert_nil q.group_by_statement
                end
                def test_sortable_columns_should_sort_assignees_according_to_user_format_setting
                  with_settings :user_format => 'lastname_coma_firstname' do
                    q = IssueQuery.new
                    assert q.sortable_columns.has_key?('assigned_to')
                    assert_equal %w(users.lastname users.firstname users.id), q.sortable_columns['assigned_to']
                  end
                end
                def test_sortable_columns_should_sort_authors_according_to_user_format_setting
                  with_settings :user_format => 'lastname_coma_firstname' do
                    q = IssueQuery.new
                    assert q.sortable_columns.has_key?('author')
                    assert_equal %w(authors.lastname authors.firstname authors.id), q.sortable_columns['author']
                  end
                end
                def test_sortable_columns_should_include_custom_field
                  q = IssueQuery.new
                  assert q.sortable_columns['cf_1']
                end
                def test_sortable_columns_should_not_include_multi_custom_field
                  field = CustomField.find(1)
                  field.update_attribute :multiple, true
                  q = IssueQuery.new
                  assert !q.sortable_columns['cf_1']
                end
                def test_default_sort
                  q = IssueQuery.new
                  assert_equal [], q.sort_criteria
                end
                def test_set_sort_criteria_with_hash
                  q = IssueQuery.new
                  q.sort_criteria = {'0' => ['priority', 'desc'], '2' => ['tracker']}
                  assert_equal [['priority', 'desc'], ['tracker', 'asc']], q.sort_criteria
                end
                def test_set_sort_criteria_with_array
                  q = IssueQuery.new
                  q.sort_criteria = [['priority', 'desc'], 'tracker']
                  assert_equal [['priority', 'desc'], ['tracker', 'asc']], q.sort_criteria
                end
                def test_create_query_with_sort
                  q = IssueQuery.new(:name => 'Sorted')
                  q.sort_criteria = [['priority', 'desc'], 'tracker']
                  assert q.save
                  q.reload
                  assert_equal [['priority', 'desc'], ['tracker', 'asc']], q.sort_criteria
                end
                def test_sort_by_string_custom_field_asc
                  q = IssueQuery.new
                  c = q.available_columns.find {|col| col.is_a?(QueryCustomFieldColumn) && col.custom_field.field_format == 'string' }
                  assert c
                  assert c.sortable
                  issues = q.issues(:order => "#{c.sortable} ASC")
                  values = issues.collect {|i| i.custom_value_for(c.custom_field).to_s}
                  assert !values.empty?
                  assert_equal values.sort, values
                end
                def test_sort_by_string_custom_field_desc
                  q = IssueQuery.new
                  c = q.available_columns.find {|col| col.is_a?(QueryCustomFieldColumn) && col.custom_field.field_format == 'string' }
                  assert c
                  assert c.sortable
                  issues = q.issues(:order => "#{c.sortable} DESC")
                  values = issues.collect {|i| i.custom_value_for(c.custom_field).to_s}
                  assert !values.empty?
                  assert_equal values.sort.reverse, values
                end
                def test_sort_by_float_custom_field_asc
                  q = IssueQuery.new
                  c = q.available_columns.find {|col| col.is_a?(QueryCustomFieldColumn) && col.custom_field.field_format == 'float' }
                  assert c
                  assert c.sortable
                  issues = q.issues(:order => "#{c.sortable} ASC")
                  values = issues.collect {|i| begin; Kernel.Float(i.custom_value_for(c.custom_field).to_s); rescue; nil; end}.compact
                  assert !values.empty?
                  assert_equal values.sort, values
                end
                def test_invalid_query_should_raise_query_statement_invalid_error
                  q = IssueQuery.new
                  assert_raise Query::StatementInvalid do
                    q.issues(:conditions => "foo = 1")
                  end
                end
                def test_issue_count
                  q = IssueQuery.new(:name => '_')
                  issue_count = q.issue_count
                  assert_equal q.issues.size, issue_count
                end
                def test_issue_count_with_archived_issues
                  p = Project.generate! do |project|
                    project.status = Project::STATUS_ARCHIVED
                  end
                  i = Issue.generate!( :project => p, :tracker => p.trackers.first )
                  assert !i.visible?
                  test_issue_count
                end
                def test_issue_count_by_association_group
                  q = IssueQuery.new(:name => '_', :group_by => 'assigned_to')
                  count_by_group = q.issue_count_by_group
                  assert_kind_of Hash, count_by_group
                  assert_equal %w(NilClass User), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
                  assert_equal %w(Fixnum), count_by_group.values.collect {|k| k.class.name}.uniq
                  assert count_by_group.has_key?(User.find(3))
                end
                def test_issue_count_by_list_custom_field_group
                  q = IssueQuery.new(:name => '_', :group_by => 'cf_1')
                  count_by_group = q.issue_count_by_group
                  assert_kind_of Hash, count_by_group
                  assert_equal %w(NilClass String), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
                  assert_equal %w(Fixnum), count_by_group.values.collect {|k| k.class.name}.uniq
                  assert count_by_group.has_key?('MySQL')
                end
                def test_issue_count_by_date_custom_field_group
                  q = IssueQuery.new(:name => '_', :group_by => 'cf_8')
                  count_by_group = q.issue_count_by_group
                  assert_kind_of Hash, count_by_group
                  assert_equal %w(Date NilClass), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
                  assert_equal %w(Fixnum), count_by_group.values.collect {|k| k.class.name}.uniq
                end
                def test_issue_count_with_nil_group_only
                  Issue.update_all("assigned_to_id = NULL")
                  q = IssueQuery.new(:name => '_', :group_by => 'assigned_to')
                  count_by_group = q.issue_count_by_group
                  assert_kind_of Hash, count_by_group
                  assert_equal 1, count_by_group.keys.size
                  assert_nil count_by_group.keys.first
                end
                def test_issue_ids
                  q = IssueQuery.new(:name => '_')
                  order = "issues.subject, issues.id"
                  issues = q.issues(:order => order)
                  assert_equal issues.map(&:id), q.issue_ids(:order => order)
                end
                def test_label_for
                  set_language_if_valid 'en'
                  q = IssueQuery.new
                  assert_equal 'Assignee', q.label_for('assigned_to_id')
                end
                def test_label_for_fr
                  set_language_if_valid 'fr'
                  q = IssueQuery.new
                  s = "Assign\xc3\xa9 \xc3\xa0"
                  s.force_encoding('UTF-8') if s.respond_to?(:force_encoding)
                  assert_equal s, q.label_for('assigned_to_id')
                end
                def test_editable_by
                  admin = User.find(1)
                  manager = User.find(2)
                  developer = User.find(3)
                  # Public query on project 1
                  q = IssueQuery.find(1)
                  assert q.editable_by?(admin)
                  assert q.editable_by?(manager)
                  assert !q.editable_by?(developer)
                  # Private query on project 1
                  q = IssueQuery.find(2)
                  assert q.editable_by?(admin)
                  assert !q.editable_by?(manager)
                  assert q.editable_by?(developer)
                  # Private query for all projects
                  q = IssueQuery.find(3)
                  assert q.editable_by?(admin)
                  assert !q.editable_by?(manager)
                  assert q.editable_by?(developer)
                  # Public query for all projects
                  q = IssueQuery.find(4)
                  assert q.editable_by?(admin)
                  assert !q.editable_by?(manager)
                  assert !q.editable_by?(developer)
                end
                def test_visible_scope
                  query_ids = IssueQuery.visible(User.anonymous).map(&:id)
                  assert query_ids.include?(1), 'public query on public project was not visible'
                  assert query_ids.include?(4), 'public query for all projects was not visible'
                  assert !query_ids.include?(2), 'private query on public project was visible'
                  assert !query_ids.include?(3), 'private query for all projects was visible'
                  assert !query_ids.include?(7), 'public query on private project was visible'
                end
                test "#available_filters should include users of visible projects in cross-project view" do
                  users = IssueQuery.new.available_filters["assigned_to_id"]
                  assert_not_nil users
                  assert users[:values].map{|u|u[1]}.include?("3")
                end
                test "#available_filters should include users of subprojects" do
                  user1 = User.generate!
                  user2 = User.generate!
                  project = Project.find(1)
                  Member.create!(:principal => user1, :project => project.children.visible.first, :role_ids => [1])
                  users = IssueQuery.new(:project => project).available_filters["assigned_to_id"]
                  assert_not_nil users
                  assert users[:values].map{|u|u[1]}.include?(user1.id.to_s)
                  assert !users[:values].map{|u|u[1]}.include?(user2.id.to_s)
                end
                test "#available_filters should include visible projects in cross-project view" do
                  projects = IssueQuery.new.available_filters["project_id"]
                  assert_not_nil projects
                  assert projects[:values].map{|u|u[1]}.include?("1")
                end
                test "#available_filters should include 'member_of_group' filter" do
                  query = IssueQuery.new
                  assert query.available_filters.keys.include?("member_of_group")
                  assert_equal :list_optional, query.available_filters["member_of_group"][:type]
                  assert query.available_filters["member_of_group"][:values].present?
                  assert_equal Group.all.sort.map {|g| [g.name, g.id.to_s]},
                    query.available_filters["member_of_group"][:values].sort
                end
                test "#available_filters should include 'assigned_to_role' filter" do
                  query = IssueQuery.new
                  assert query.available_filters.keys.include?("assigned_to_role")
                  assert_equal :list_optional, query.available_filters["assigned_to_role"][:type]
                  assert query.available_filters["assigned_to_role"][:values].include?(['Manager','1'])
                  assert query.available_filters["assigned_to_role"][:values].include?(['Developer','2'])
                  assert query.available_filters["assigned_to_role"][:values].include?(['Reporter','3'])
                  assert ! query.available_filters["assigned_to_role"][:values].include?(['Non member','4'])
                  assert ! query.available_filters["assigned_to_role"][:values].include?(['Anonymous','5'])
                end
                context "#statement" do
                  context "with 'member_of_group' filter" do
                    setup do
                      Group.destroy_all # No fixtures
                      @user_in_group = User.generate!
                      @second_user_in_group = User.generate!
                      @user_in_group2 = User.generate!
                      @user_not_in_group = User.generate!
                      @group = Group.generate!.reload
                      @group.users << @user_in_group
                      @group.users << @second_user_in_group
                      @group2 = Group.generate!.reload
                      @group2.users << @user_in_group2
                    end
                    should "search assigned to for users in the group" do
                      @query = IssueQuery.new(:name => '_')
                      @query.add_filter('member_of_group', '=', [@group.id.to_s])
                      assert_query_statement_includes @query, "#{Issue.table_name}.assigned_to_id IN ('#{@user_in_group.id}','#{@second_user_in_group.id}','#{@group.id}')"
                      assert_find_issues_with_query_is_successful @query
                    end
                    should "search not assigned to any group member (none)" do
                      @query = IssueQuery.new(:name => '_')
                      @query.add_filter('member_of_group', '!*', [''])
                      # Users not in a group
                      assert_query_statement_includes @query, "#{Issue.table_name}.assigned_to_id IS NULL OR #{Issue.table_name}.assigned_to_id NOT IN ('#{@user_in_group.id}','#{@second_user_in_group.id}','#{@user_in_group2.id}','#{@group.id}','#{@group2.id}')"
                      assert_find_issues_with_query_is_successful @query
                    end
                    should "search assigned to any group member (all)" do
                      @query = IssueQuery.new(:name => '_')
                      @query.add_filter('member_of_group', '*', [''])
                      # Only users in a group
                      assert_query_statement_includes @query, "#{Issue.table_name}.assigned_to_id IN ('#{@user_in_group.id}','#{@second_user_in_group.id}','#{@user_in_group2.id}','#{@group.id}','#{@group2.id}')"
                      assert_find_issues_with_query_is_successful @query
                    end
                    should "return an empty set with = empty group" do
                      @empty_group = Group.generate!
                      @query = IssueQuery.new(:name => '_')
                      @query.add_filter('member_of_group', '=', [@empty_group.id.to_s])
                      assert_equal [], find_issues_with_query(@query)
                    end
                    should "return issues with ! empty group" do
                      @empty_group = Group.generate!
                      @query = IssueQuery.new(:name => '_')
                      @query.add_filter('member_of_group', '!', [@empty_group.id.to_s])
                      assert_find_issues_with_query_is_successful @query
                    end
                  end
                  context "with 'assigned_to_role' filter" do
                    setup do
                      @manager_role = Role.find_by_name('Manager')
                      @developer_role = Role.find_by_name('Developer')
                      @project = Project.generate!
                      @manager = User.generate!
                      @developer = User.generate!
                      @boss = User.generate!
                      @guest = User.generate!
                      User.add_to_project(@manager, @project, @manager_role)
                      User.add_to_project(@developer, @project, @developer_role)
                      User.add_to_project(@boss, @project, [@manager_role, @developer_role])
                      @issue1 = Issue.generate!(:project => @project, :assigned_to_id => @manager.id)
                      @issue2 = Issue.generate!(:project => @project, :assigned_to_id => @developer.id)
                      @issue3 = Issue.generate!(:project => @project, :assigned_to_id => @boss.id)
                      @issue4 = Issue.generate!(:project => @project, :assigned_to_id => @guest.id)
                      @issue5 = Issue.generate!(:project => @project)
                    end
                    should "search assigned to for users with the Role" do
                      @query = IssueQuery.new(:name => '_', :project => @project)
                      @query.add_filter('assigned_to_role', '=', [@manager_role.id.to_s])
                      assert_query_result [@issue1, @issue3], @query
                    end
                    should "search assigned to for users with the Role on the issue project" do
                      other_project = Project.generate!
                      User.add_to_project(@developer, other_project, @manager_role)
                      @query = IssueQuery.new(:name => '_', :project => @project)
                      @query.add_filter('assigned_to_role', '=', [@manager_role.id.to_s])
                      assert_query_result [@issue1, @issue3], @query
                    end
                    should "return an empty set with empty role" do
                      @empty_role = Role.generate!
                      @query = IssueQuery.new(:name => '_', :project => @project)
                      @query.add_filter('assigned_to_role', '=', [@empty_role.id.to_s])
                      assert_query_result [], @query
                    end
                    should "search assigned to for users without the Role" do
                      @query = IssueQuery.new(:name => '_', :project => @project)
                      @query.add_filter('assigned_to_role', '!', [@manager_role.id.to_s])
                      assert_query_result [@issue2, @issue4, @issue5], @query
                    end
                    should "search assigned to for users not assigned to any Role (none)" do
                      @query = IssueQuery.new(:name => '_', :project => @project)
                      @query.add_filter('assigned_to_role', '!*', [''])
                      assert_query_result [@issue4, @issue5], @query
                    end
                    should "search assigned to for users assigned to any Role (all)" do
                      @query = IssueQuery.new(:name => '_', :project => @project)
                      @query.add_filter('assigned_to_role', '*', [''])
                      assert_query_result [@issue1, @issue2, @issue3], @query
                    end
                    should "return issues with ! empty role" do
                      @empty_role = Role.generate!
                      @query = IssueQuery.new(:name => '_', :project => @project)
                      @query.add_filter('assigned_to_role', '!', [@empty_role.id.to_s])
                      assert_query_result [@issue1, @issue2, @issue3, @issue4, @issue5], @query
                    end
                  end
                end
              end

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