Mercurial > hg > soundsoftware-site
diff app/models/query.rb @ 1298:4f746d8966dd redmine_2.3_integration
Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
| author | Chris Cannam |
|---|---|
| date | Fri, 14 Jun 2013 09:28:30 +0100 |
| parents | 622f24f53b42 |
| children |
line wrap: on
line diff
--- a/app/models/query.rb Fri Jun 14 09:07:32 2013 +0100 +++ b/app/models/query.rb Fri Jun 14 09:28:30 2013 +0100 @@ -1,5 +1,5 @@ # Redmine - project management software -# Copyright (C) 2006-2012 Jean-Philippe Lang +# 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 @@ -28,11 +28,12 @@ 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 @@ -48,8 +49,12 @@ @inline end - def value(issue) - issue.send name + def frozen? + @frozen + end + + def value(object) + object.send name end def css_classes @@ -75,8 +80,8 @@ @cf end - def value(issue) - cv = issue.custom_values.select {|v| v.custom_field_id == @cf.id}.collect {|v| @cf.cast_value(v.value)} + 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 @@ -85,6 +90,28 @@ 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 @@ -101,85 +128,89 @@ validates_length_of :name, :maximum => 255 validate :validate_query_filters - @@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, - "w" => :label_this_week, - ">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 + 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 + } - cattr_reader :operators + 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", "!*", "*"] + } - @@operators_by_filter_type = { :list => [ "=", "!" ], - :list_status => [ "o", "=", "!", "c", "*" ], - :list_optional => [ "=", "!", "!*", "*" ], - :list_subprojects => [ "*", "!*", "=" ], - :date => [ "=", ">=", "<=", "><", "<t+", ">t+", "><t+", "t+", "t", "w", ">t-", "<t-", "><t-", "t-", "!*", "*" ], - :date_past => [ "=", ">=", "<=", "><", ">t-", "<t-", "><t-", "t-", "t", "w", "!*", "*" ], - :string => [ "=", "~", "!", "!~", "!*", "*" ], - :text => [ "~", "!~", "!*", "*" ], - :integer => [ "=", ">=", "<=", "><", "!*", "*" ], - :float => [ "=", ">=", "<=", "><", "!*", "*" ], - :relation => ["=", "=p", "=!p", "!p", "!*", "*"]} + class_attribute :available_columns + self.available_columns = [] - cattr_reader :operators_by_filter_type + class_attribute :queried_class - @@available_columns = [ - 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(:relations, :caption => :label_related_issues), - QueryColumn.new(:description, :inline => false) - ] - cattr_reader :available_columns - - 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 - { - :conditions => ["(#{table_name}.project_id IS NULL OR (#{base})) AND (#{table_name}.is_public = ? OR #{table_name}.user_id = ?)", true, user_id], - :include => :project - } - } + def queried_table_name + @queried_table_name ||= self.class.queried_class.table_name + end def initialize(attributes=nil, *args) super attributes - self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} } @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) @@ -202,7 +233,7 @@ # 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", "w"].include? operator_for(field) + ["o", "c", "!*", "*", "t", "ld", "w", "lw", "l2w", "m", "lm", "y"].include? operator_for(field) end if filters end @@ -211,11 +242,6 @@ errors.add(:base, m) 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 editable_by?(user) return false unless user # Admin can edit them all and regular users can edit their private queries @@ -225,154 +251,12 @@ end def trackers - @trackers ||= project.nil? ? Tracker.find(:all, :order => 'position') : project.rolled_up_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 - - def available_filters - return @available_filters if @available_filters - @available_filters = { - "status_id" => { - :type => :list_status, :order => 0, - :values => IssueStatus.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } - }, - "tracker_id" => { - :type => :list, :order => 2, :values => trackers.collect{|s| [s.name, s.id.to_s] } - }, - "priority_id" => { - :type => :list, :order => 3, :values => IssuePriority.all.collect{|s| [s.name, s.id.to_s] } - }, - "subject" => { :type => :text, :order => 8 }, - "created_on" => { :type => :date_past, :order => 9 }, - "updated_on" => { :type => :date_past, :order => 10 }, - "start_date" => { :type => :date, :order => 11 }, - "due_date" => { :type => :date, :order => 12 }, - "estimated_hours" => { :type => :float, :order => 13 }, - "done_ratio" => { :type => :integer, :order => 14 } - } - IssueRelation::TYPES.each do |relation_type, options| - @available_filters[relation_type] = { - :type => :relation, :order => @available_filters.size + 100, - :label => options[:name] - } - end - 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 => 13, - :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)} - - 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] } - @available_filters["assigned_to_id"] = { - :type => :list_optional, :order => 4, :values => assigned_to_values - } unless assigned_to_values.empty? - - author_values = [] - author_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged? - author_values += users.collect{|s| [s.name, s.id.to_s] } - @available_filters["author_id"] = { - :type => :list, :order => 5, :values => author_values - } unless author_values.empty? - - group_values = Group.all.collect {|g| [g.name, g.id.to_s] } - @available_filters["member_of_group"] = { - :type => :list_optional, :order => 6, :values => group_values - } unless group_values.empty? - - role_values = Role.givable.collect {|r| [r.name, r.id.to_s] } - @available_filters["assigned_to_role"] = { - :type => :list_optional, :order => 7, :values => role_values - } unless role_values.empty? - - if User.current.logged? - @available_filters["watcher_id"] = { - :type => :list, :order => 15, :values => [["<< #{l(:label_me)} >>", "me"]] - } - end - - if project - # project specific filters - categories = project.issue_categories.all - unless categories.empty? - @available_filters["category_id"] = { - :type => :list_optional, :order => 6, - :values => categories.collect{|s| [s.name, s.id.to_s] } - } - end - versions = project.shared_versions.all - unless versions.empty? - @available_filters["fixed_version_id"] = { - :type => :list_optional, :order => 7, - :values => versions.sort.collect{|s| ["#{s.project.name} - #{s.name}", s.id.to_s] } - } - end - add_custom_fields_filters(project.all_issue_custom_fields) - else - # global filters for cross project issue list - system_shared_versions = Version.visible.find_all_by_sharing('system') - unless system_shared_versions.empty? - @available_filters["fixed_version_id"] = { - :type => :list_optional, :order => 7, - :values => system_shared_versions.sort.collect{|s| - ["#{s.project.name} - #{s.name}", s.id.to_s] - } - } - end - add_custom_fields_filters( - IssueCustomField.find(:all, - :conditions => { - :is_filter => true, - :is_for_all => true - })) - end - add_associations_custom_fields_filters :project, :author, :assigned_to, :fixed_version - if User.current.allowed_to?(:set_issues_private, nil, :global => true) || - User.current.allowed_to?(:set_own_issues_private, nil, :global => true) - @available_filters["is_private"] = { - :type => :list, :order => 16, - :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]] - } - end - Tracker.disabled_core_fields(trackers).each {|field| - @available_filters.delete field - } - @available_filters.each do |field, options| - options[:name] ||= l(options[:label] || "field_#{field}".gsub(/_id$/, '')) - end - @available_filters + operators.inject({}) {|h, operator| h[operator.first] = l(*operator.last); h} end # Returns a representation of the available filters for JSON serialization @@ -399,17 +283,43 @@ @all_projects_values = values end - def add_filter(field, operator, values) + # 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] - # check if operator is allowed for that filter - #if @@operators_by_filter_type[filter_options[:type]].include? operator - # allowed_values = values & ([""] + (filter_options[:values] || []).collect {|val| val[1]}) - # filters[field] = {:operator => operator, :values => allowed_values } if (allowed_values.first and !allowed_values.first.empty?) or ["o", "c", "!*", "*", "t"].include? operator - #end filters[field] = {:operator => operator, :values => (values || [''])} end end @@ -417,9 +327,10 @@ 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| + 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('|') : [''] + values = $1 + add_filter field, operator, values.present? ? values.split('|') : [''] end || add_filter(field, '=', expression.split('|')) end @@ -457,43 +368,6 @@ label ||= l("field_#{field.to_s.gsub(/_id$/, '')}", :default => field) end - def available_columns - return @available_columns if @available_columns - @available_columns = ::Query.available_columns.dup - @available_columns += (project ? - project.all_issue_custom_fields : - IssueCustomField.find(: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 => "(SELECT COALESCE(SUM(hours), 0) FROM #{TimeEntry.table_name} WHERE #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id)", - :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 self.available_columns=(v) - self.available_columns = (v) - end - def self.add_available_column(column) self.available_columns << (column) if column.is_a?(QueryColumn) end @@ -505,17 +379,18 @@ # Returns a Hash of columns and the key for sorting def sortable_columns - {'id' => "#{Issue.table_name}.id"}.merge(available_columns.inject({}) {|h, column| - h[column.name.to_s] = column.sortable - h - }) + 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 @@ -535,11 +410,7 @@ 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 def column_names=(names) @@ -645,7 +516,7 @@ operator = operator_for(field) # "me" value subsitution - if %w(assigned_to_id author_id watcher_id).include?(field) + 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) @@ -670,7 +541,7 @@ filters_clauses << send("sql_for_#{field}_field", field, operator, v) else # regular field - filters_clauses << '(' + sql_for_field(field, operator, v, Issue.table_name, field) + ')' + filters_clauses << '(' + sql_for_field(field, operator, v, queried_table_name, field) + ')' end end if filters and valid? @@ -680,182 +551,6 @@ filters_clauses.any? ? filters_clauses.join(' AND ') : nil 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(: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]].reject {|s| s.blank?}.join(',') - order_option = nil if order_option.blank? - - issues = Issue.visible.scoped(:conditions => options[:conditions]).find :all, :include => ([:status, :project] + (options[:include] || [])).uniq, - :conditions => statement, - :order => order_option, - :joins => joins_for_order_statement(order_option), - :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]].reject {|s| s.blank?}.join(',') - order_option = nil if order_option.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), - :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.find :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.scoped(:conditions => options[:conditions]).find :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| - if group && group.user_ids.present? - user_ids << group.user_ids - end - user_ids.flatten.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 - private def sql_for_custom_field(field, operator, value, custom_field_id) @@ -875,15 +570,18 @@ not_in = 'NOT' end customized_key = "id" - customized_class = Issue + customized_class = queried_class if field =~ /^(.+)\.cf_/ assoc = $1 customized_key = "#{assoc}_id" - customized_class = Issue.reflect_on_association(assoc.to_sym).klass.base_class rescue nil - raise "Unknown Issue association #{assoc}" unless customized_class + 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 - "#{Issue.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) + ')' + where = sql_for_field(field, operator, value, db_table, db_field, true) + if operator =~ /[<>]/ + where = "(#{where}) AND #{db_table}.#{db_field} <> ''" + 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 #{where})" end # Helper method to generate the WHERE sql for a +field+, +operator+ and a +value+ @@ -897,13 +595,13 @@ 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(#{db_table}.#{db_field} AS decimal(60,3)) = #{value.first.to_i})" + 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(#{db_table}.#{db_field} AS decimal(60,3)) BETWEEN #{value.first.to_f - 1e-5} AND #{value.first.to_f + 1e-5})" + 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 @@ -932,7 +630,7 @@ 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(#{db_table}.#{db_field} AS decimal(60,3)) >= #{value.first.to_f})" + 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 @@ -942,7 +640,7 @@ 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(#{db_table}.#{db_field} AS decimal(60,3)) <= #{value.first.to_f})" + 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 @@ -952,15 +650,15 @@ 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(#{db_table}.#{db_field} AS decimal(60,3)) BETWEEN #{value[0].to_f} AND #{value[1].to_f})" + 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 = "#{Issue.table_name}.status_id IN (SELECT id FROM #{IssueStatus.table_name} WHERE is_closed=#{connection.quoted_false})" if field == "status_id" + 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 = "#{Issue.table_name}.status_id IN (SELECT id FROM #{IssueStatus.table_name} WHERE is_closed=#{connection.quoted_true})" if field == "status_id" + 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) @@ -988,12 +686,39 @@ 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 "!~" @@ -1007,31 +732,30 @@ def add_custom_fields_filters(custom_fields, assoc=nil) return unless custom_fields.present? - @available_filters ||= {} - custom_fields.select(&:is_filter?).each do |field| + custom_fields.select(&:is_filter?).sort.each do |field| case field.field_format when "text" - options = { :type => :text, :order => 20 } + options = { :type => :text } when "list" - options = { :type => :list_optional, :values => field.possible_values, :order => 20} + options = { :type => :list_optional, :values => field.possible_values } when "date" - options = { :type => :date, :order => 20 } + options = { :type => :date } when "bool" - options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 } + options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]] } when "int" - options = { :type => :integer, :order => 20 } + options = { :type => :integer } when "float" - options = { :type => :float, :order => 20 } + 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, :order => 20} + options = { :type => :list_optional, :values => values } else - options = { :type => :string, :order => 20 } + options = { :type => :string } end filter_id = "cf_#{field.id}" filter_name = field.name @@ -1039,7 +763,7 @@ filter_id = "#{assoc}.#{filter_id}" filter_name = l("label_attribute_of_#{assoc}", :name => filter_name) end - @available_filters[filter_id] = options.merge({ + add_available_filter filter_id, options.merge({ :name => filter_name, :format => field.field_format, :field => field @@ -1050,7 +774,7 @@ def add_associations_custom_fields_filters(*associations) fields_by_class = CustomField.where(:is_filter => true).group_by(&:class) associations.each do |assoc| - association_klass = Issue.reflect_on_association(assoc).klass + 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) @@ -1091,7 +815,7 @@ if order_options if order_options.include?('authors') - joins << "LEFT OUTER JOIN #{User.table_name} authors ON authors.id = #{Issue.table_name}.author_id" + 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}