jro_apps/redmine Commit - r10944:e18d0e268de5

Makes issue custom fields available as timelog columns (#1766)....

Jean-Philippe Lang -

r10944:e18d0e268de5

parent child

Context file:

r10944:e18d0e268de5

Collapse all files

app/models/query.rb +22 0

             # 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}"
               end
               def caption
                 l(@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 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
               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)}(.*)$/
                   add_filter field, operator, $1.present? ? $1.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|
                    available_columns.find { |col| col.name == name }
                 end.compact
               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?
                 @available_filters ||= {}
                 custom_fields.select(&:is_filter?).each do |field|
                   case field.field_format
                   when "text"
                     options = { :type => :text, :order => 20 }
                   when "list"
                     options = { :type => :list_optional, :values => field.possible_values, :order => 20}
                   when "date"
                     options = { :type => :date, :order => 20 }
                   when "bool"
                     options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 }
                   when "int"
                     options = { :type => :integer, :order => 20 }
                   when "float"
                     options = { :type => :float, :order => 20 }
                   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, :order => 20}
                   else
                     options = { :type => :string, :order => 20 }
                   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
                   @available_filters[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/models/time_entry_query.rb +1 0

             # 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 TimeEntryQuery < Query
               self.queried_class = TimeEntry
               self.available_columns = [
                 QueryColumn.new(:project, :sortable => "#{Project.table_name}.name", :groupable => true),
                 QueryColumn.new(:spent_on, :sortable => ["#{TimeEntry.table_name}.spent_on", "#{TimeEntry.table_name}.created_on"], :default_order => 'desc', :groupable => true),
                 QueryColumn.new(:user, :sortable => lambda {User.fields_for_order_statement}, :groupable => true),
                 QueryColumn.new(:activity, :sortable => "#{TimeEntryActivity.table_name}.position", :groupable => true),
                 QueryColumn.new(:issue, :sortable => "#{Issue.table_name}.id"),
                 QueryColumn.new(:comments),
                 QueryColumn.new(:hours, :sortable => "#{TimeEntry.table_name}.hours"),
               ]
               def initialize(attributes=nil, *args)
                 super attributes
                 self.filters ||= {}
                 add_filter('spent_on', '*') unless filters.present?
               end
               def available_filters
                 return @available_filters if @available_filters
                 @available_filters = {
                   "spent_on" => { :type => :date_past, :order => 0 },
                   "comments" => { :type => :text, :order => 5 },
                   "hours" => { :type => :float, :order => 6 }
                 }
                 principals = []
                 if project
                   principals += project.principals.sort
                   unless project.leaf?
                     subprojects = project.descendants.visible.all
                     if subprojects.any?
                       @available_filters["subproject_id"] = {
                         :type => :list_subprojects, :order => 1,
                         :values => subprojects.collect{|s| [s.name, s.id.to_s] }
                       }
                       principals += Principal.member_of(subprojects)
                     end
                   end
                 else
                   if all_projects.any?
                     # members of visible projects
                     principals += Principal.member_of(all_projects)
                     # project filter
                     project_values = []
                     if User.current.logged? && User.current.memberships.any?
                       project_values << ["<< #{l(:label_my_projects).downcase} >>", "mine"]
                     end
                     project_values += all_projects_values
                     @available_filters["project_id"] = {
                       :type => :list, :order => 1, :values => project_values
                     } unless project_values.empty?
                   end
                 end
                 principals.uniq!
                 principals.sort!
                 users = principals.select {|p| p.is_a?(User)}
                 users_values = []
                 users_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
                 users_values += users.collect{|s| [s.name, s.id.to_s] }
                 @available_filters["user_id"] = {
                   :type => :list_optional, :order => 2, :values => users_values
                 } unless users_values.empty?
                 activities = (project ? project.activities : TimeEntryActivity.shared.active)
                 @available_filters["activity_id"] = {
                   :type => :list, :order => 3, :values => activities.map {|a| [a.name, a.id.to_s]}
                 } unless activities.empty?
                 add_custom_fields_filters(TimeEntryCustomField.where(:is_filter => true).all)
                 add_associations_custom_fields_filters :project, :issue, :user
                 @available_filters.each do |field, options|
                   options[:name] ||= l(options[:label] || "field_#{field}".gsub(/_id$/, ''))
                 end
                 @available_filters
               end
               def available_columns
                 return @available_columns if @available_columns
                 @available_columns = self.class.available_columns.dup
                 @available_columns += TimeEntryCustomField.all.map {|cf| QueryCustomFieldColumn.new(cf) }
+                @available_columns += IssueCustomField.all.map {|cf| QueryAssociationCustomFieldColumn.new(:issue, cf) }
                 @available_columns
               end
               def default_columns_names
                 @default_columns_names ||= [:project, :spent_on, :user, :activity, :issue, :comments, :hours]
               end
               # Accepts :from/:to params as shortcut filters
               def build_from_params(params)
                 super
                 if params[:from].present? && params[:to].present?
                   add_filter('spent_on', '><', [params[:from], params[:to]])
                 elsif params[:from].present?
                   add_filter('spent_on', '>=', [params[:from]])
                 elsif params[:to].present?
                   add_filter('spent_on', '<=', [params[:to]])
                 end
                 self
               end
             end

test/functional/timelog_controller_test.rb +10 0

             # -*- coding: 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.
             require File.expand_path('../../test_helper', __FILE__)
             class TimelogControllerTest < ActionController::TestCase
               fixtures :projects, :enabled_modules, :roles, :members,
                        :member_roles, :issues, :time_entries, :users,
                        :trackers, :enumerations, :issue_statuses,
                        :custom_fields, :custom_values
               include Redmine::I18n
               def test_new_with_project_id
                 @request.session[:user_id] = 3
                 get :new, :project_id => 1
                 assert_response :success
                 assert_template 'new'
                 assert_select 'select[name=?]', 'time_entry[project_id]', 0
                 assert_select 'input[name=?][value=1][type=hidden]', 'time_entry[project_id]'
               end
               def test_new_with_issue_id
                 @request.session[:user_id] = 3
                 get :new, :issue_id => 2
                 assert_response :success
                 assert_template 'new'
                 assert_select 'select[name=?]', 'time_entry[project_id]', 0
                 assert_select 'input[name=?][value=1][type=hidden]', 'time_entry[project_id]'
               end
               def test_new_without_project
                 @request.session[:user_id] = 3
                 get :new
                 assert_response :success
                 assert_template 'new'
                 assert_select 'select[name=?]', 'time_entry[project_id]'
                 assert_select 'input[name=?]', 'time_entry[project_id]', 0
               end
               def test_new_without_project_should_prefill_the_form
                 @request.session[:user_id] = 3
                 get :new, :time_entry => {:project_id => '1'}
                 assert_response :success
                 assert_template 'new'
                 assert_select 'select[name=?]', 'time_entry[project_id]' do
                   assert_select 'option[value=1][selected=selected]'
                 end
                 assert_select 'input[name=?]', 'time_entry[project_id]', 0
               end
               def test_new_without_project_should_deny_without_permission
                 Role.all.each {|role| role.remove_permission! :log_time}
                 @request.session[:user_id] = 3
                 get :new
                 assert_response 403
               end
               def test_new_should_select_default_activity
                 @request.session[:user_id] = 3
                 get :new, :project_id => 1
                 assert_response :success
                 assert_select 'select[name=?]', 'time_entry[activity_id]' do
                   assert_select 'option[selected=selected]', :text => 'Development'
                 end
               end
               def test_new_should_only_show_active_time_entry_activities
                 @request.session[:user_id] = 3
                 get :new, :project_id => 1
                 assert_response :success
                 assert_no_tag 'option', :content => 'Inactive Activity'
               end
               def test_get_edit_existing_time
                 @request.session[:user_id] = 2
                 get :edit, :id => 2, :project_id => nil
                 assert_response :success
                 assert_template 'edit'
                 # Default activity selected
                 assert_tag :tag => 'form', :attributes => { :action => '/projects/ecookbook/time_entries/2' }
               end
               def test_get_edit_with_an_existing_time_entry_with_inactive_activity
                 te = TimeEntry.find(1)
                 te.activity = TimeEntryActivity.find_by_name("Inactive Activity")
                 te.save!
                 @request.session[:user_id] = 1
                 get :edit, :project_id => 1, :id => 1
                 assert_response :success
                 assert_template 'edit'
                 # Blank option since nothing is pre-selected
                 assert_tag :tag => 'option', :content => '--- Please select ---'
               end
               def test_post_create
                 # TODO: should POST to issues’ time log instead of project. change form
                 # and routing
                 @request.session[:user_id] = 3
                 post :create, :project_id => 1,
                             :time_entry => {:comments => 'Some work on TimelogControllerTest',
                                             # Not the default activity
                                             :activity_id => '11',
                                             :spent_on => '2008-03-14',
                                             :issue_id => '1',
                                             :hours => '7.3'}
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 i = Issue.find(1)
                 t = TimeEntry.find_by_comments('Some work on TimelogControllerTest')
                 assert_not_nil t
                 assert_equal 11, t.activity_id
                 assert_equal 7.3, t.hours
                 assert_equal 3, t.user_id
                 assert_equal i, t.issue
                 assert_equal i.project, t.project
               end
               def test_post_create_with_blank_issue
                 # TODO: should POST to issues’ time log instead of project. change form
                 # and routing
                 @request.session[:user_id] = 3
                 post :create, :project_id => 1,
                             :time_entry => {:comments => 'Some work on TimelogControllerTest',
                                             # Not the default activity
                                             :activity_id => '11',
                                             :issue_id => '',
                                             :spent_on => '2008-03-14',
                                             :hours => '7.3'}
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 t = TimeEntry.find_by_comments('Some work on TimelogControllerTest')
                 assert_not_nil t
                 assert_equal 11, t.activity_id
                 assert_equal 7.3, t.hours
                 assert_equal 3, t.user_id
               end
               def test_create_and_continue
                 @request.session[:user_id] = 2
                 post :create, :project_id => 1,
                             :time_entry => {:activity_id => '11',
                                             :issue_id => '',
                                             :spent_on => '2008-03-14',
                                             :hours => '7.3'},
                             :continue => '1'
                 assert_redirected_to '/projects/ecookbook/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D='
               end
               def test_create_and_continue_with_issue_id
                 @request.session[:user_id] = 2
                 post :create, :project_id => 1,
                             :time_entry => {:activity_id => '11',
                                             :issue_id => '1',
                                             :spent_on => '2008-03-14',
                                             :hours => '7.3'},
                             :continue => '1'
                 assert_redirected_to '/projects/ecookbook/issues/1/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=1'
               end
               def test_create_and_continue_without_project
                 @request.session[:user_id] = 2
                 post :create, :time_entry => {:project_id => '1',
                                             :activity_id => '11',
                                             :issue_id => '',
                                             :spent_on => '2008-03-14',
                                             :hours => '7.3'},
                               :continue => '1'
                 assert_redirected_to '/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=&time_entry%5Bproject_id%5D=1'
               end
               def test_create_without_log_time_permission_should_be_denied
                 @request.session[:user_id] = 2
                 Role.find_by_name('Manager').remove_permission! :log_time
                 post :create, :project_id => 1,
                             :time_entry => {:activity_id => '11',
                                             :issue_id => '',
                                             :spent_on => '2008-03-14',
                                             :hours => '7.3'}
                 assert_response 403
               end
               def test_create_with_failure
                 @request.session[:user_id] = 2
                 post :create, :project_id => 1,
                             :time_entry => {:activity_id => '',
                                             :issue_id => '',
                                             :spent_on => '2008-03-14',
                                             :hours => '7.3'}
                 assert_response :success
                 assert_template 'new'
               end
               def test_create_without_project
                 @request.session[:user_id] = 2
                 assert_difference 'TimeEntry.count' do
                   post :create, :time_entry => {:project_id => '1',
                                               :activity_id => '11',
                                               :issue_id => '',
                                               :spent_on => '2008-03-14',
                                               :hours => '7.3'}
                 end
                 assert_redirected_to '/projects/ecookbook/time_entries'
                 time_entry = TimeEntry.first(:order => 'id DESC')
                 assert_equal 1, time_entry.project_id
               end
               def test_create_without_project_should_fail_with_issue_not_inside_project
                 @request.session[:user_id] = 2
                 assert_no_difference 'TimeEntry.count' do
                   post :create, :time_entry => {:project_id => '1',
                                               :activity_id => '11',
                                               :issue_id => '5',
                                               :spent_on => '2008-03-14',
                                               :hours => '7.3'}
                 end
                 assert_response :success
                 assert assigns(:time_entry).errors[:issue_id].present?
               end
               def test_create_without_project_should_deny_without_permission
                 @request.session[:user_id] = 2
                 Project.find(3).disable_module!(:time_tracking)
                 assert_no_difference 'TimeEntry.count' do
                   post :create, :time_entry => {:project_id => '3',
                                               :activity_id => '11',
                                               :issue_id => '',
                                               :spent_on => '2008-03-14',
                                               :hours => '7.3'}
                 end
                 assert_response 403
               end
               def test_create_without_project_with_failure
                 @request.session[:user_id] = 2
                 assert_no_difference 'TimeEntry.count' do
                   post :create, :time_entry => {:project_id => '1',
                                               :activity_id => '11',
                                               :issue_id => '',
                                               :spent_on => '2008-03-14',
                                               :hours => ''}
                 end
                 assert_response :success
                 assert_tag 'select', :attributes => {:name => 'time_entry[project_id]'},
                   :child => {:tag => 'option', :attributes => {:value => '1', :selected => 'selected'}}
               end
               def test_update
                 entry = TimeEntry.find(1)
                 assert_equal 1, entry.issue_id
                 assert_equal 2, entry.user_id
                 @request.session[:user_id] = 1
                 put :update, :id => 1,
                             :time_entry => {:issue_id => '2',
                                             :hours => '8'}
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 entry.reload
                 assert_equal 8, entry.hours
                 assert_equal 2, entry.issue_id
                 assert_equal 2, entry.user_id
               end
               def test_get_bulk_edit
                 @request.session[:user_id] = 2
                 get :bulk_edit, :ids => [1, 2]
                 assert_response :success
                 assert_template 'bulk_edit'
                 assert_select 'ul#bulk-selection' do
                   assert_select 'li', 2
                   assert_select 'li a', :text => '03/23/2007 - eCookbook: 4.25 hours'
                 end
                 assert_select 'form#bulk_edit_form[action=?]', '/time_entries/bulk_update' do
                   # System wide custom field
                   assert_select 'select[name=?]', 'time_entry[custom_field_values][10]'
                   # Activities
                   assert_select 'select[name=?]', 'time_entry[activity_id]' do
                     assert_select 'option[value=]', :text => '(No change)'
                     assert_select 'option[value=9]', :text => 'Design'
                   end
                 end
               end
               def test_get_bulk_edit_on_different_projects
                 @request.session[:user_id] = 2
                 get :bulk_edit, :ids => [1, 2, 6]
                 assert_response :success
                 assert_template 'bulk_edit'
               end
               def test_bulk_update
                 @request.session[:user_id] = 2
                 # update time entry activity
                 post :bulk_update, :ids => [1, 2], :time_entry => { :activity_id => 9}
                 assert_response 302
                 # check that the issues were updated
                 assert_equal [9, 9], TimeEntry.find_all_by_id([1, 2]).collect {|i| i.activity_id}
               end
               def test_bulk_update_with_failure
                 @request.session[:user_id] = 2
                 post :bulk_update, :ids => [1, 2], :time_entry => { :hours => 'A'}
                 assert_response 302
                 assert_match /Failed to save 2 time entrie/, flash[:error]
               end
               def test_bulk_update_on_different_projects
                 @request.session[:user_id] = 2
                 # makes user a manager on the other project
                 Member.create!(:user_id => 2, :project_id => 3, :role_ids => [1])
                 # update time entry activity
                 post :bulk_update, :ids => [1, 2, 4], :time_entry => { :activity_id => 9 }
                 assert_response 302
                 # check that the issues were updated
                 assert_equal [9, 9, 9], TimeEntry.find_all_by_id([1, 2, 4]).collect {|i| i.activity_id}
               end
               def test_bulk_update_on_different_projects_without_rights
                 @request.session[:user_id] = 3
                 user = User.find(3)
                 action = { :controller => "timelog", :action => "bulk_update" }
                 assert user.allowed_to?(action, TimeEntry.find(1).project)
                 assert ! user.allowed_to?(action, TimeEntry.find(5).project)
                 post :bulk_update, :ids => [1, 5], :time_entry => { :activity_id => 9 }
                 assert_response 403
               end
               def test_bulk_update_custom_field
                 @request.session[:user_id] = 2
                 post :bulk_update, :ids => [1, 2], :time_entry => { :custom_field_values => {'10' => '0'} }
                 assert_response 302
                 assert_equal ["0", "0"], TimeEntry.find_all_by_id([1, 2]).collect {|i| i.custom_value_for(10).value}
               end
               def test_post_bulk_update_should_redirect_back_using_the_back_url_parameter
                 @request.session[:user_id] = 2
                 post :bulk_update, :ids => [1,2], :back_url => '/time_entries'
                 assert_response :redirect
                 assert_redirected_to '/time_entries'
               end
               def test_post_bulk_update_should_not_redirect_back_using_the_back_url_parameter_off_the_host
                 @request.session[:user_id] = 2
                 post :bulk_update, :ids => [1,2], :back_url => 'http://google.com'
                 assert_response :redirect
                 assert_redirected_to :controller => 'timelog', :action => 'index', :project_id => Project.find(1).identifier
               end
               def test_post_bulk_update_without_edit_permission_should_be_denied
                 @request.session[:user_id] = 2
                 Role.find_by_name('Manager').remove_permission! :edit_time_entries
                 post :bulk_update, :ids => [1,2]
                 assert_response 403
               end
               def test_destroy
                 @request.session[:user_id] = 2
                 delete :destroy, :id => 1
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert_equal I18n.t(:notice_successful_delete), flash[:notice]
                 assert_nil TimeEntry.find_by_id(1)
               end
               def test_destroy_should_fail
                 # simulate that this fails (e.g. due to a plugin), see #5700
                 TimeEntry.any_instance.expects(:destroy).returns(false)
                 @request.session[:user_id] = 2
                 delete :destroy, :id => 1
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert_equal I18n.t(:notice_unable_delete_time_entry), flash[:error]
                 assert_not_nil TimeEntry.find_by_id(1)
               end
               def test_index_all_projects
                 get :index
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
                 assert_tag :form,
                   :attributes => {:action => "/time_entries", :id => 'query_form'}
               end
               def test_index_all_projects_should_show_log_time_link
                 @request.session[:user_id] = 2
                 get :index
                 assert_response :success
                 assert_template 'index'
                 assert_tag 'a', :attributes => {:href => '/time_entries/new'}, :content => /Log time/
               end
               def test_index_at_project_level
                 get :index, :project_id => 'ecookbook'
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:entries)
                 assert_equal 4, assigns(:entries).size
                 # project and subproject
                 assert_equal [1, 3], assigns(:entries).collect(&:project_id).uniq.sort
                 assert_not_nil assigns(:total_hours)
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
                 assert_tag :form,
                   :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
               end
               def test_index_at_project_level_with_date_range
                 get :index, :project_id => 'ecookbook',
                   :f => ['spent_on'],
                   :op => {'spent_on' => '><'},
                   :v => {'spent_on' => ['2007-03-20', '2007-04-30']}
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:entries)
                 assert_equal 3, assigns(:entries).size
                 assert_not_nil assigns(:total_hours)
                 assert_equal "12.90", "%.2f" % assigns(:total_hours)
                 assert_tag :form,
                   :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
               end
               def test_index_at_project_level_with_date_range_using_from_and_to_params
                 get :index, :project_id => 'ecookbook', :from => '2007-03-20', :to => '2007-04-30'
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:entries)
                 assert_equal 3, assigns(:entries).size
                 assert_not_nil assigns(:total_hours)
                 assert_equal "12.90", "%.2f" % assigns(:total_hours)
                 assert_tag :form,
                   :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
               end
               def test_index_at_project_level_with_period
                 get :index, :project_id => 'ecookbook',
                   :f => ['spent_on'],
                   :op => {'spent_on' => '>t-'},
                   :v => {'spent_on' => ['7']}
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:entries)
                 assert_not_nil assigns(:total_hours)
                 assert_tag :form,
                   :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
               end
               def test_index_at_issue_level
                 get :index, :issue_id => 1
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:entries)
                 assert_equal 2, assigns(:entries).size
                 assert_not_nil assigns(:total_hours)
                 assert_equal 154.25, assigns(:total_hours)
                 # display all time
                 assert_nil assigns(:from)
                 assert_nil assigns(:to)
                 # TODO: remove /projects/:project_id/issues/:issue_id/time_entries routes
                 # to use /issues/:issue_id/time_entries
                 assert_tag :form,
                   :attributes => {:action => "/projects/ecookbook/issues/1/time_entries", :id => 'query_form'}
               end
               def test_index_should_sort_by_spent_on_and_created_on
                 t1 = TimeEntry.create!(:user => User.find(1), :project => Project.find(1), :hours => 1, :spent_on => '2012-06-16', :created_on => '2012-06-16 20:00:00', :activity_id => 10)
                 t2 = TimeEntry.create!(:user => User.find(1), :project => Project.find(1), :hours => 1, :spent_on => '2012-06-16', :created_on => '2012-06-16 20:05:00', :activity_id => 10)
                 t3 = TimeEntry.create!(:user => User.find(1), :project => Project.find(1), :hours => 1, :spent_on => '2012-06-15', :created_on => '2012-06-16 20:10:00', :activity_id => 10)
                 get :index, :project_id => 1,
                   :f => ['spent_on'],
                   :op => {'spent_on' => '><'},
                   :v => {'spent_on' => ['2012-06-15', '2012-06-16']}
                 assert_response :success
                 assert_equal [t2, t1, t3], assigns(:entries)
                 get :index, :project_id => 1,
                   :f => ['spent_on'],
                   :op => {'spent_on' => '><'},
                   :v => {'spent_on' => ['2012-06-15', '2012-06-16']},
                   :sort => 'spent_on'
                 assert_response :success
                 assert_equal [t3, t1, t2], assigns(:entries)
               end
               def test_index_with_filter_on_issue_custom_field
                 issue = Issue.generate!(:project_id => 1, :tracker_id => 1, :custom_field_values => {2 => 'filter_on_issue_custom_field'})
                 entry = TimeEntry.generate!(:issue => issue, :hours => 2.5)
                 get :index, :f => ['issue.cf_2'], :op => {'issue.cf_2' => '='}, :v => {'issue.cf_2' => ['filter_on_issue_custom_field']}
                 assert_response :success
                 assert_equal [entry], assigns(:entries)
               end
+              def test_index_with_issue_custom_field_column
+                issue = Issue.generate!(:project_id => 1, :tracker_id => 1, :custom_field_values => {2 => 'filter_on_issue_custom_field'})
+                entry = TimeEntry.generate!(:issue => issue, :hours => 2.5)
+                get :index, :c => %w(project spent_on issue comments hours issue.cf_2)
+                assert_response :success
+                assert_include :'issue.cf_2', assigns(:query).column_names
+                assert_select 'td.issue_cf_2', :text => 'filter_on_issue_custom_field'
+              end
               def test_index_atom_feed
                 get :index, :project_id => 1, :format => 'atom'
                 assert_response :success
                 assert_equal 'application/atom+xml', @response.content_type
                 assert_not_nil assigns(:items)
                 assert assigns(:items).first.is_a?(TimeEntry)
               end
               def test_index_all_projects_csv_export
                 Setting.date_format = '%m/%d/%Y'
                 get :index, :format => 'csv'
                 assert_response :success
                 assert_equal 'text/csv; header=present', @response.content_type
                 assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment,Overtime\n")
                 assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\",\"\"\n")
               end
               def test_index_csv_export
                 Setting.date_format = '%m/%d/%Y'
                 get :index, :project_id => 1, :format => 'csv'
                 assert_response :success
                 assert_equal 'text/csv; header=present', @response.content_type
                 assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment,Overtime\n")
                 assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\",\"\"\n")
               end
               def test_index_csv_export_with_multi_custom_field
                 field = TimeEntryCustomField.create!(:name => 'Test', :field_format => 'list',
                   :multiple => true, :possible_values => ['value1', 'value2'])
                 entry = TimeEntry.find(1)
                 entry.custom_field_values = {field.id => ['value1', 'value2']}
                 entry.save!
                 get :index, :project_id => 1, :format => 'csv'
                 assert_response :success
                 assert_include '"value1, value2"', @response.body
               end
               def test_csv_big_5
                 user = User.find_by_id(3)
                 user.language = "zh-TW"
                 assert user.save
                 str_utf8  = "\xe4\xb8\x80\xe6\x9c\x88"
                 str_big5  = "\xa4@\xa4\xeb"
                 if str_utf8.respond_to?(:force_encoding)
                   str_utf8.force_encoding('UTF-8')
                   str_big5.force_encoding('Big5')
                 end
                 @request.session[:user_id] = 3
                 post :create, :project_id => 1,
                             :time_entry => {:comments => str_utf8,
                                             # Not the default activity
                                             :activity_id => '11',
                                             :issue_id => '',
                                             :spent_on => '2011-11-10',
                                             :hours => '7.3'}
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 t = TimeEntry.find_by_comments(str_utf8)
                 assert_not_nil t
                 assert_equal 11, t.activity_id
                 assert_equal 7.3, t.hours
                 assert_equal 3, t.user_id
                 get :index, :project_id => 1, :format => 'csv',
                     :from => '2011-11-10', :to => '2011-11-10'
                 assert_response :success
                 assert_equal 'text/csv; header=present', @response.content_type
                 ar = @response.body.chomp.split("\n")
                 s1 = "\xa4\xe9\xb4\xc1"
                 if str_utf8.respond_to?(:force_encoding)
                   s1.force_encoding('Big5')
                 end
                 assert ar[0].include?(s1)
                 assert ar[1].include?(str_big5)
               end
               def test_csv_cannot_convert_should_be_replaced_big_5
                 user = User.find_by_id(3)
                 user.language = "zh-TW"
                 assert user.save
                 str_utf8  = "\xe4\xbb\xa5\xe5\x86\x85"
                 if str_utf8.respond_to?(:force_encoding)
                   str_utf8.force_encoding('UTF-8')
                 end
                 @request.session[:user_id] = 3
                 post :create, :project_id => 1,
                             :time_entry => {:comments => str_utf8,
                                             # Not the default activity
                                             :activity_id => '11',
                                             :issue_id => '',
                                             :spent_on => '2011-11-10',
                                             :hours => '7.3'}
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 t = TimeEntry.find_by_comments(str_utf8)
                 assert_not_nil t
                 assert_equal 11, t.activity_id
                 assert_equal 7.3, t.hours
                 assert_equal 3, t.user_id
                 get :index, :project_id => 1, :format => 'csv',
                     :from => '2011-11-10', :to => '2011-11-10'
                 assert_response :success
                 assert_equal 'text/csv; header=present', @response.content_type
                 ar = @response.body.chomp.split("\n")
                 s1 = "\xa4\xe9\xb4\xc1"
                 if str_utf8.respond_to?(:force_encoding)
                   s1.force_encoding('Big5')
                 end
                 assert ar[0].include?(s1)
                 s2 = ar[1].split(",")[8]
                 if s2.respond_to?(:force_encoding)
                   s3 = "\xa5H?"
                   s3.force_encoding('Big5')
                   assert_equal s3, s2
                 elsif RUBY_PLATFORM == 'java'
                   assert_equal "??", s2
                 else
                   assert_equal "\xa5H???", s2
                 end
               end
               def test_csv_tw
                 with_settings :default_language => "zh-TW" do
                   str1  = "test_csv_tw"
                   user = User.find_by_id(3)
                   te1 = TimeEntry.create(:spent_on => '2011-11-10',
                                          :hours    => 999.9,
                                          :project  => Project.find(1),
                                          :user     => user,
                                          :activity => TimeEntryActivity.find_by_name('Design'),
                                          :comments => str1)
                   te2 = TimeEntry.find_by_comments(str1)
                   assert_not_nil te2
                   assert_equal 999.9, te2.hours
                   assert_equal 3, te2.user_id
                   get :index, :project_id => 1, :format => 'csv',
                       :from => '2011-11-10', :to => '2011-11-10'
                   assert_response :success
                   assert_equal 'text/csv; header=present', @response.content_type
                   ar = @response.body.chomp.split("\n")
                   s2 = ar[1].split(",")[7]
                   assert_equal '999.9', s2
                   str_tw = "Traditional Chinese (\xe7\xb9\x81\xe9\xab\x94\xe4\xb8\xad\xe6\x96\x87)"
                   if str_tw.respond_to?(:force_encoding)
                     str_tw.force_encoding('UTF-8')
                   end
                   assert_equal str_tw, l(:general_lang_name)
                   assert_equal ',', l(:general_csv_separator)
                   assert_equal '.', l(:general_csv_decimal_separator)
                 end
               end
               def test_csv_fr
                 with_settings :default_language => "fr" do
                   str1  = "test_csv_fr"
                   user = User.find_by_id(3)
                   te1 = TimeEntry.create(:spent_on => '2011-11-10',
                                          :hours    => 999.9,
                                          :project  => Project.find(1),
                                          :user     => user,
                                          :activity => TimeEntryActivity.find_by_name('Design'),
                                          :comments => str1)
                   te2 = TimeEntry.find_by_comments(str1)
                   assert_not_nil te2
                   assert_equal 999.9, te2.hours
                   assert_equal 3, te2.user_id
                   get :index, :project_id => 1, :format => 'csv',
                       :from => '2011-11-10', :to => '2011-11-10'
                   assert_response :success
                   assert_equal 'text/csv; header=present', @response.content_type
                   ar = @response.body.chomp.split("\n")
                   s2 = ar[1].split(";")[7]
                   assert_equal '999,9', s2
                   str_fr = "Fran\xc3\xa7ais"
                   if str_fr.respond_to?(:force_encoding)
                     str_fr.force_encoding('UTF-8')
                   end
                   assert_equal str_fr, l(:general_lang_name)
                   assert_equal ';', l(:general_csv_separator)
                   assert_equal ',', l(:general_csv_decimal_separator)
                 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