jro_apps/redmine Commit - r13357:2fe806a4a49c

Rewrites search engine to properly paginate results (#18631)....

Jean-Philippe Lang -

r13357:2fe806a4a49c

parent child

Context file:

r13357:2fe806a4a49c

Collapse all files

app/controllers/search_controller.rb +29 -27

             # Redmine - project management software
             # Copyright (C) 2006-2014  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class SearchController < ApplicationController
               before_filter :find_optional_project
               def index
                 @question = params[:q] || ""
                 @question.strip!
                 @all_words = params[:all_words] ? params[:all_words].present? : true
                 @titles_only = params[:titles_only] ? params[:titles_only].present? : false
                 projects_to_search =
                   case params[:scope]
                   when 'all'
                     nil
                   when 'my_projects'
                     User.current.memberships.collect(&:project)
                   when 'subprojects'
                     @project ? (@project.self_and_descendants.active.to_a) : nil
                   else
                     @project
                   end
-                offset = nil
-                begin; offset = params[:offset].to_time if params[:offset]; rescue; end
                 # quick jump to an issue
                 if (m = @question.match(/^#?(\d+)$/)) && (issue = Issue.visible.find_by_id(m[1].to_i))
                   redirect_to issue_path(issue)
                   return
                 end
                 @object_types = Redmine::Search.available_search_types.dup
                 if projects_to_search.is_a? Project
                   # don't search projects
                   @object_types.delete('projects')
                   # only show what the user is allowed to view
                   @object_types = @object_types.select {|o| User.current.allowed_to?("view_#{o}".to_sym, projects_to_search)}
                 end
                 @scope = @object_types.select {|t| params[t]}
                 @scope = @object_types if @scope.empty?
                 # extract tokens from the question
                 # eg. hello "bye bye" => ["hello", "bye bye"]
                 @tokens = @question.scan(%r{((\s|^)"[\s\w]+"(\s|$)|\S+)}).collect {|m| m.first.gsub(%r{(^\s*"\s*|\s*"\s*$)}, '')}
                 # tokens must be at least 2 characters long
                 @tokens = @tokens.uniq.select {|w| w.length > 1 }
                 if !@tokens.empty?
                   # no more than 5 tokens to search for
                   @tokens.slice! 5..-1 if @tokens.size > 5
-                  @results = []
-                  @results_by_type = Hash.new {|h,k| h[k] = 0}
                   limit = 10
-                  @scope.each do |s|
-                    r, c = s.singularize.camelcase.constantize.search(@tokens, projects_to_search,
+                  @result_count = 0
+                  @result_count_by_type = Hash.new {|h,k| h[k] = 0}
+                  ranks_and_ids = []
+                  # get all the results ranks and ids
+                  @scope.each do |scope|
+                    klass = scope.singularize.camelcase.constantize
+                    ranks_and_ids_in_scope = klass.search_result_ranks_and_ids(@tokens, User.current, projects_to_search,
                       :all_words => @all_words,
-                      :titles_only => @titles_only,
+                      :titles_only => @titles_only
-                      :limit => (limit+1),
-                      :offset => offset,
+                    @result_count_by_type[scope] += ranks_and_ids_in_scope.size
-                      :before => params[:previous].nil?)
+                    @result_count += ranks_and_ids_in_scope.size
-                    @results += r
+                    ranks_and_ids += ranks_and_ids_in_scope.map {|r| [scope, r]}
-                    @results_by_type[s] += c
                   end
-                  @results = @results.sort {|a,b| b.event_datetime <=> a.event_datetime}
+                  @result_pages = Paginator.new @result_count, limit, params['page']
-                  if params[:previous].nil?
-                    @pagination_previous_date = @results[0].event_datetime if offset && @results[0]
+                  # sort results, higher rank and id first
-                    if @results.size > limit
+                  ranks_and_ids.sort! {|a,b| b.last <=> a.last }
-                      @pagination_next_date = @results[limit-1].event_datetime
+                  ranks_and_ids = ranks_and_ids[@result_pages.offset, limit] || []
-                      @results = @results[0, limit]
-                    end
+                  # load the results to display
-                  else
+                  results_by_scope = Hash.new {|h,k| h[k] = []}
-                    @pagination_next_date = @results[-1].event_datetime if offset && @results[-1]
+                  ranks_and_ids.group_by(&:first).each do |scope, rs|
-                    if @results.size > limit
+                    klass = scope.singularize.camelcase.constantize
-                      @pagination_previous_date = @results[-(limit)].event_datetime
+                    results_by_scope[scope] += klass.search_results_from_ids(rs.map(&:last).map(&:last))
-                      @results = @results[-(limit), limit]
-                    end
                   end
+                  @results = ranks_and_ids.map do |scope, r|
+                    results_by_scope[scope].detect {|record| record.id == r.last}
+                  end.compact
                 else
                   @question = ""
                 end
                 render :layout => false if request.xhr?
               end
             private
               def find_optional_project
                 return true unless params[:id]
                 @project = Project.find(params[:id])
                 check_project_privacy
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/models/changeset.rb +2 -2

             # Redmine - project management software
             # Copyright (C) 2006-2014  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Changeset < ActiveRecord::Base
               belongs_to :repository
               belongs_to :user
               has_many :filechanges, :class_name => 'Change', :dependent => :delete_all
               has_and_belongs_to_many :issues
               has_and_belongs_to_many :parents,
                                       :class_name => "Changeset",
                                       :join_table => "#{table_name_prefix}changeset_parents#{table_name_suffix}",
                                       :association_foreign_key => 'parent_id', :foreign_key => 'changeset_id'
               has_and_belongs_to_many :children,
                                       :class_name => "Changeset",
                                       :join_table => "#{table_name_prefix}changeset_parents#{table_name_suffix}",
                                       :association_foreign_key => 'changeset_id', :foreign_key => 'parent_id'
               acts_as_event :title => Proc.new {|o| o.title},
                             :description => :long_comments,
                             :datetime => :committed_on,
                             :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project, :repository_id => o.repository.identifier_param, :rev => o.identifier}}
               acts_as_searchable :columns => 'comments',
-                                 :scope => preload(:repository => :project),
+                                 :preload => {:repository => :project},
                                  :project_key => "#{Repository.table_name}.project_id",
-                                 :date_column => "#{Changeset.table_name}.committed_on"
+                                 :date_column => :committed_on
               acts_as_activity_provider :timestamp => "#{table_name}.committed_on",
                                         :author_key => :user_id,
                                         :scope => preload(:user, {:repository => :project})
               validates_presence_of :repository_id, :revision, :committed_on, :commit_date
               validates_uniqueness_of :revision, :scope => :repository_id
               validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
               attr_protected :id
               scope :visible, lambda {|*args|
                 joins(:repository => :project).
                 where(Project.allowed_to_condition(args.shift || User.current, :view_changesets, *args))
               }
               after_create :scan_for_issues
               before_create :before_create_cs
               def revision=(r)
                 write_attribute :revision, (r.nil? ? nil : r.to_s)
               end
               # Returns the identifier of this changeset; depending on repository backends
               def identifier
                 if repository.class.respond_to? :changeset_identifier
                   repository.class.changeset_identifier self
                 else
                   revision.to_s
                 end
               end
               def committed_on=(date)
                 self.commit_date = date
                 super
               end
               # Returns the readable identifier
               def format_identifier
                 if repository.class.respond_to? :format_changeset_identifier
                   repository.class.format_changeset_identifier self
                 else
                   identifier
                 end
               end
               def project
                 repository.project
               end
               def author
                 user || committer.to_s.split('<').first
               end
               def before_create_cs
                 self.committer = self.class.to_utf8(self.committer, repository.repo_log_encoding)
                 self.comments  = self.class.normalize_comments(
                                    self.comments, repository.repo_log_encoding)
                 self.user = repository.find_committer_user(self.committer)
               end
               def scan_for_issues
                 scan_comment_for_issue_ids
               end
               TIMELOG_RE = /
                 (
                 ((\d+)(h|hours?))((\d+)(m|min)?)?
                 |
                 ((\d+)(h|hours?|m|min))
                 |
                 (\d+):(\d+)
                 |
                 (\d+([\.,]\d+)?)h?
                 )
                 /x
               def scan_comment_for_issue_ids
                 return if comments.blank?
                 # keywords used to reference issues
                 ref_keywords = Setting.commit_ref_keywords.downcase.split(",").collect(&:strip)
                 ref_keywords_any = ref_keywords.delete('*')
                 # keywords used to fix issues
                 fix_keywords = Setting.commit_update_keywords_array.map {|r| r['keywords']}.flatten.compact
                 kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")
                 referenced_issues = []
                 comments.scan(/([\s\(\[,-]|^)((#{kw_regexp})[\s:]+)?(#\d+(\s+@#{TIMELOG_RE})?([\s,;&]+#\d+(\s+@#{TIMELOG_RE})?)*)(?=[[:punct:]]|\s|<|$)/i) do |match|
                   action, refs = match[2].to_s.downcase, match[3]
                   next unless action.present? || ref_keywords_any
                   refs.scan(/#(\d+)(\s+@#{TIMELOG_RE})?/).each do |m|
                     issue, hours = find_referenced_issue_by_id(m[0].to_i), m[2]
                     if issue && !issue_linked_to_same_commit?(issue)
                       referenced_issues << issue
                       # Don't update issues or log time when importing old commits
                       unless repository.created_on && committed_on && committed_on < repository.created_on
                         fix_issue(issue, action) if fix_keywords.include?(action)
                         log_time(issue, hours) if hours && Setting.commit_logtime_enabled?
                       end
                     end
                   end
                 end
                 referenced_issues.uniq!
                 self.issues = referenced_issues unless referenced_issues.empty?
               end
               def short_comments
                 @short_comments || split_comments.first
               end
               def long_comments
                 @long_comments || split_comments.last
               end
               def text_tag(ref_project=nil)
                 repo = ""
                 if repository && repository.identifier.present?
                   repo = "#{repository.identifier}|"
                 end
                 tag = if scmid?
                   "commit:#{repo}#{scmid}"
                 else
                   "#{repo}r#{revision}"
                 end
                 if ref_project && project && ref_project != project
                   tag = "#{project.identifier}:#{tag}"
                 end
                 tag
               end
               # Returns the title used for the changeset in the activity/search results
               def title
                 repo = (repository && repository.identifier.present?) ? " (#{repository.identifier})" : ''
                 comm = short_comments.blank? ? '' : (': ' + short_comments)
                 "#{l(:label_revision)} #{format_identifier}#{repo}#{comm}"
               end
               # Returns the previous changeset
               def previous
                 @previous ||= Changeset.where(["id < ? AND repository_id = ?", id, repository_id]).order('id DESC').first
               end
               # Returns the next changeset
               def next
                 @next ||= Changeset.where(["id > ? AND repository_id = ?", id, repository_id]).order('id ASC').first
               end
               # Creates a new Change from it's common parameters
               def create_change(change)
                 Change.create(:changeset     => self,
                               :action        => change[:action],
                               :path          => change[:path],
                               :from_path     => change[:from_path],
                               :from_revision => change[:from_revision])
               end
               # Finds an issue that can be referenced by the commit message
               def find_referenced_issue_by_id(id)
                 return nil if id.blank?
                 issue = Issue.includes(:project).where(:id => id.to_i).first
                 if Setting.commit_cross_project_ref?
                   # all issues can be referenced/fixed
                 elsif issue
                   # issue that belong to the repository project, a subproject or a parent project only
                   unless issue.project &&
                             (project == issue.project || project.is_ancestor_of?(issue.project) ||
                              project.is_descendant_of?(issue.project))
                     issue = nil
                   end
                 end
                 issue
               end
               private
               # Returns true if the issue is already linked to the same commit
               # from a different repository
               def issue_linked_to_same_commit?(issue)
                 repository.same_commits_in_scope(issue.changesets, self).any?
               end
               # Updates the +issue+ according to +action+
               def fix_issue(issue, action)
                 # the issue may have been updated by the closure of another one (eg. duplicate)
                 issue.reload
                 # don't change the status is the issue is closed
                 return if issue.closed?
                 journal = issue.init_journal(user || User.anonymous,
                                              ll(Setting.default_language,
                                                 :text_status_changed_by_changeset,
                                                 text_tag(issue.project)))
                 rule = Setting.commit_update_keywords_array.detect do |rule|
                   rule['keywords'].include?(action) &&
                     (rule['if_tracker_id'].blank? || rule['if_tracker_id'] == issue.tracker_id.to_s)
                 end
                 if rule
                   issue.assign_attributes rule.slice(*Issue.attribute_names)
                 end
                 Redmine::Hook.call_hook(:model_changeset_scan_commit_for_issue_ids_pre_issue_update,
                                         { :changeset => self, :issue => issue, :action => action })
                 unless issue.save
                   logger.warn("Issue ##{issue.id} could not be saved by changeset #{id}: #{issue.errors.full_messages}") if logger
                 end
                 issue
               end
               def log_time(issue, hours)
                 time_entry = TimeEntry.new(
                   :user => user,
                   :hours => hours,
                   :issue => issue,
                   :spent_on => commit_date,
                   :comments => l(:text_time_logged_by_changeset, :value => text_tag(issue.project),
                                  :locale => Setting.default_language)
                   )
                 time_entry.activity = log_time_activity unless log_time_activity.nil?
                 unless time_entry.save
                   logger.warn("TimeEntry could not be created by changeset #{id}: #{time_entry.errors.full_messages}") if logger
                 end
                 time_entry
               end
               def log_time_activity
                 if Setting.commit_logtime_activity_id.to_i > 0
                   TimeEntryActivity.find_by_id(Setting.commit_logtime_activity_id.to_i)
                 end
               end
               def split_comments
                 comments =~ /\A(.+?)\r?\n(.*)$/m
                 @short_comments = $1 || comments
                 @long_comments = $2.to_s.strip
                 return @short_comments, @long_comments
               end
               public
               # Strips and reencodes a commit log before insertion into the database
               def self.normalize_comments(str, encoding)
                 Changeset.to_utf8(str.to_s.strip, encoding)
               end
               def self.to_utf8(str, encoding)
                 Redmine::CodesetUtil.to_utf8(str, encoding)
               end
             end

app/models/document.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2014  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Document < ActiveRecord::Base
               include Redmine::SafeAttributes
               belongs_to :project
               belongs_to :category, :class_name => "DocumentCategory"
               acts_as_attachable :delete_permission => :delete_documents
               acts_as_searchable :columns => ['title', "#{table_name}.description"],
-                                 :scope => preload(:project)
+                                 :preload => :project
               acts_as_event :title => Proc.new {|o| "#{l(:label_document)}: #{o.title}"},
                             :author => Proc.new {|o| o.attachments.reorder("#{Attachment.table_name}.created_on ASC").first.try(:author) },
                             :url => Proc.new {|o| {:controller => 'documents', :action => 'show', :id => o.id}}
               acts_as_activity_provider :scope => preload(:project)
               validates_presence_of :project, :title, :category
               validates_length_of :title, :maximum => 60
               attr_protected :id
               after_create :send_notification
               scope :visible, lambda {|*args|
                 joins(:project).
                 where(Project.allowed_to_condition(args.shift || User.current, :view_documents, *args))
               }
               safe_attributes 'category_id', 'title', 'description'
               def visible?(user=User.current)
                 !user.nil? && user.allowed_to?(:view_documents, project)
               end
               def initialize(attributes=nil, *args)
                 super
                 if new_record?
                   self.category ||= DocumentCategory.default
                 end
               end
               def updated_on
                 unless @updated_on
                   a = attachments.last
                   @updated_on = (a && a.created_on) || created_on
                 end
                 @updated_on
               end
               private
               def send_notification
                 if Setting.notified_events.include?('document_added')
                   Mailer.document_added(self).deliver
                 end
               end
             end

app/models/issue.rb +1 -2

             # Redmine - project management software
             # Copyright (C) 2006-2014  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Issue < ActiveRecord::Base
               include Redmine::SafeAttributes
               include Redmine::Utils::DateCalculation
               include Redmine::I18n
               belongs_to :project
               belongs_to :tracker
               belongs_to :status, :class_name => 'IssueStatus'
               belongs_to :author, :class_name => 'User'
               belongs_to :assigned_to, :class_name => 'Principal'
               belongs_to :fixed_version, :class_name => 'Version'
               belongs_to :priority, :class_name => 'IssuePriority'
               belongs_to :category, :class_name => 'IssueCategory'
               has_many :journals, :as => :journalized, :dependent => :destroy
               has_many :visible_journals,
                 lambda {where(["(#{Journal.table_name}.private_notes = ? OR (#{Project.allowed_to_condition(User.current, :view_private_notes)}))", false])},
                 :class_name => 'Journal',
                 :as => :journalized
               has_many :time_entries, :dependent => :destroy
               has_and_belongs_to_many :changesets, lambda {order("#{Changeset.table_name}.committed_on ASC, #{Changeset.table_name}.id ASC")}
               has_many :relations_from, :class_name => 'IssueRelation', :foreign_key => 'issue_from_id', :dependent => :delete_all
               has_many :relations_to, :class_name => 'IssueRelation', :foreign_key => 'issue_to_id', :dependent => :delete_all
               acts_as_nested_set :scope => 'root_id', :dependent => :destroy
               acts_as_attachable :after_add => :attachment_added, :after_remove => :attachment_removed
               acts_as_customizable
               acts_as_watchable
               acts_as_searchable :columns => ['subject', "#{table_name}.description", "#{Journal.table_name}.notes"],
-                                 # sort by id so that limited eager loading doesn't break with postgresql
+                                 :preload => [:project, :status, :tracker],
-                                 :order_column => "#{table_name}.id",
                                  :scope => lambda { joins(:project).
                                                     joins("LEFT OUTER JOIN #{Journal.table_name} ON #{Journal.table_name}.journalized_type='Issue'" +
                                                           " AND #{Journal.table_name}.journalized_id = #{Issue.table_name}.id" +
                                                           " AND (#{Journal.table_name}.private_notes = #{connection.quoted_false}" +
                                                                 " OR (#{Project.allowed_to_condition(User.current, :view_private_notes)}))") }
               acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id} (#{o.status}): #{o.subject}"},
                             :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}},
                             :type => Proc.new {|o| 'issue' + (o.closed? ? ' closed' : '') }
               acts_as_activity_provider :scope => preload(:project, :author, :tracker),
                                         :author_key => :author_id
               DONE_RATIO_OPTIONS = %w(issue_field issue_status)
               attr_reader :current_journal
               delegate :notes, :notes=, :private_notes, :private_notes=, :to => :current_journal, :allow_nil => true
               validates_presence_of :subject, :project, :tracker
               validates_presence_of :priority, :if => Proc.new {|issue| issue.new_record? || issue.priority_id_changed?}
               validates_presence_of :status, :if => Proc.new {|issue| issue.new_record? || issue.status_id_changed?}
               validates_presence_of :author, :if => Proc.new {|issue| issue.new_record? || issue.author_id_changed?}
               validates_length_of :subject, :maximum => 255
               validates_inclusion_of :done_ratio, :in => 0..100
               validates :estimated_hours, :numericality => {:greater_than_or_equal_to => 0, :allow_nil => true, :message => :invalid}
               validates :start_date, :date => true
               validates :due_date, :date => true
               validate :validate_issue, :validate_required_fields
               attr_protected :id
               scope :visible, lambda {|*args|
                 includes(:project).
                 references(:project).
                 where(Issue.visible_condition(args.shift || User.current, *args))
               }
               scope :open, lambda {|*args|
                 is_closed = args.size > 0 ? !args.first : false
                 joins(:status).
                 where("#{IssueStatus.table_name}.is_closed = ?", is_closed)
               }
               scope :recently_updated, lambda { order("#{Issue.table_name}.updated_on DESC") }
               scope :on_active_project, lambda {
                 joins(:project).
                 where("#{Project.table_name}.status = ?", Project::STATUS_ACTIVE)
               }
               scope :fixed_version, lambda {|versions|
                 ids = [versions].flatten.compact.map {|v| v.is_a?(Version) ? v.id : v}
                 ids.any? ? where(:fixed_version_id => ids) : where('1=0')
               }
               before_create :default_assign
               before_save :close_duplicates, :update_done_ratio_from_issue_status,
                           :force_updated_on_change, :update_closed_on, :set_assigned_to_was
               after_save {|issue| issue.send :after_project_change if !issue.id_changed? && issue.project_id_changed?}
               after_save :reschedule_following_issues, :update_nested_set_attributes,
                          :update_parent_attributes, :create_journal
               # Should be after_create but would be called before previous after_save callbacks
               after_save :after_create_from_copy
               after_destroy :update_parent_attributes
               after_create :send_notification
               # Keep it at the end of after_save callbacks
               after_save :clear_assigned_to_was
               # Returns a SQL conditions string used to find all issues visible by the specified user
               def self.visible_condition(user, options={})
                 Project.allowed_to_condition(user, :view_issues, options) do |role, user|
                   if user.id && user.logged?
                     case role.issues_visibility
                     when 'all'
                       nil
                     when 'default'
                       user_ids = [user.id] + user.groups.map(&:id).compact
                       "(#{table_name}.is_private = #{connection.quoted_false} OR #{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))"
                     when 'own'
                       user_ids = [user.id] + user.groups.map(&:id).compact
                       "(#{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))"
                     else
                       '1=0'
                     end
                   else
                     "(#{table_name}.is_private = #{connection.quoted_false})"
                   end
                 end
               end
               # Returns true if usr or current user is allowed to view the issue
               def visible?(usr=nil)
                 (usr || User.current).allowed_to?(:view_issues, self.project) do |role, user|
                   if user.logged?
                     case role.issues_visibility
                     when 'all'
                       true
                     when 'default'
                       !self.is_private? || (self.author == user || user.is_or_belongs_to?(assigned_to))
                     when 'own'
                       self.author == user || user.is_or_belongs_to?(assigned_to)
                     else
                       false
                     end
                   else
                     !self.is_private?
                   end
                 end
               end
               # Returns true if user or current user is allowed to edit or add a note to the issue
               def editable?(user=User.current)
                 user.allowed_to?(:edit_issues, project) || user.allowed_to?(:add_issue_notes, project)
               end
               def initialize(attributes=nil, *args)
                 super
                 if new_record?
                   # set default values for new records only
                   self.priority ||= IssuePriority.default
                   self.watcher_user_ids = []
                 end
               end
               def create_or_update
                 super
               ensure
                 @status_was = nil
               end
               private :create_or_update
               # AR#Persistence#destroy would raise and RecordNotFound exception
               # if the issue was already deleted or updated (non matching lock_version).
               # This is a problem when bulk deleting issues or deleting a project
               # (because an issue may already be deleted if its parent was deleted
               # first).
               # The issue is reloaded by the nested_set before being deleted so
               # the lock_version condition should not be an issue but we handle it.
               def destroy
                 super
               rescue ActiveRecord::RecordNotFound
                 # Stale or already deleted
                 begin
                   reload
                 rescue ActiveRecord::RecordNotFound
                   # The issue was actually already deleted
                   @destroyed = true
                   return freeze
                 end
                 # The issue was stale, retry to destroy
                 super
               end
               alias :base_reload :reload
               def reload(*args)
                 @workflow_rule_by_attribute = nil
                 @assignable_versions = nil
                 @relations = nil
                 @spent_hours = nil
                 base_reload(*args)
               end
               # Overrides Redmine::Acts::Customizable::InstanceMethods#available_custom_fields
               def available_custom_fields
                 (project && tracker) ? (project.all_issue_custom_fields & tracker.custom_fields) : []
               end
               def visible_custom_field_values(user=nil)
                 user_real = user || User.current
                 custom_field_values.select do |value|
                   value.custom_field.visible_by?(project, user_real)
                 end
               end
               # Copies attributes from another issue, arg can be an id or an Issue
               def copy_from(arg, options={})
                 issue = arg.is_a?(Issue) ? arg : Issue.visible.find(arg)
                 self.attributes = issue.attributes.dup.except("id", "root_id", "parent_id", "lft", "rgt", "created_on", "updated_on")
                 self.custom_field_values = issue.custom_field_values.inject({}) {|h,v| h[v.custom_field_id] = v.value; h}
                 self.status = issue.status
                 self.author = User.current
                 unless options[:attachments] == false
                   self.attachments = issue.attachments.map do |attachement|
                     attachement.copy(:container => self)
                   end
                 end
                 @copied_from = issue
                 @copy_options = options
                 self
               end
               # Returns an unsaved copy of the issue
               def copy(attributes=nil, copy_options={})
                 copy = self.class.new.copy_from(self, copy_options)
                 copy.attributes = attributes if attributes
                 copy
               end
               # Returns true if the issue is a copy
               def copy?
                 @copied_from.present?
               end
               def status_id=(status_id)
                 if status_id.to_s != self.status_id.to_s
                   self.status = (status_id.present? ? IssueStatus.find_by_id(status_id) : nil)
                 end
                 self.status_id
               end
               # Sets the status.
               def status=(status)
                 if status != self.status
                   @workflow_rule_by_attribute = nil
                 end
                 association(:status).writer(status)
               end
               def priority_id=(pid)
                 self.priority = nil
                 write_attribute(:priority_id, pid)
               end
               def category_id=(cid)
                 self.category = nil
                 write_attribute(:category_id, cid)
               end
               def fixed_version_id=(vid)
                 self.fixed_version = nil
                 write_attribute(:fixed_version_id, vid)
               end
               def tracker_id=(tracker_id)
                 if tracker_id.to_s != self.tracker_id.to_s
                   self.tracker = (tracker_id.present? ? Tracker.find_by_id(tracker_id) : nil)
                 end
                 self.tracker_id
               end
               # Sets the tracker.
               # This will set the status to the default status of the new tracker if:
               # * the status was the default for the previous tracker
               # * or if the status was not part of the new tracker statuses
               # * or the status was nil
               def tracker=(tracker)
                 if tracker != self.tracker
                   if status == default_status
                     self.status = nil
                   elsif status && tracker && !tracker.issue_status_ids.include?(status.id)
                     self.status = nil
                   end
                   @custom_field_values = nil
                   @workflow_rule_by_attribute = nil
                 end
                 association(:tracker).writer(tracker)
                 self.status ||= default_status
                 self.tracker
               end
               def project_id=(project_id)
                 if project_id.to_s != self.project_id.to_s
                   self.project = (project_id.present? ? Project.find_by_id(project_id) : nil)
                 end
                 self.project_id
               end
               # Sets the project.
               # Unless keep_tracker argument is set to true, this will change the tracker
               # to the first tracker of the new project if the previous tracker is not part
               # of the new project trackers.
               # This will clear the fixed_version is it's no longer valid for the new project.
               # This will clear the parent issue if it's no longer valid for the new project.
               # This will set the category to the category with the same name in the new
               # project if it exists, or clear it if it doesn't.
               def project=(project, keep_tracker=false)
                 project_was = self.project
                 association(:project).writer(project)
                 if project_was && project && project_was != project
                   @assignable_versions = nil
                   unless keep_tracker || project.trackers.include?(tracker)
                     self.tracker = project.trackers.first
                   end
                   # Reassign to the category with same name if any
                   if category
                     self.category = project.issue_categories.find_by_name(category.name)
                   end
                   # Keep the fixed_version if it's still valid in the new_project
                   if fixed_version && fixed_version.project != project && !project.shared_versions.include?(fixed_version)
                     self.fixed_version = nil
                   end
                   # Clear the parent task if it's no longer valid
                   unless valid_parent_project?
                     self.parent_issue_id = nil
                   end
                   @custom_field_values = nil
                   @workflow_rule_by_attribute = nil
                 end
                 self.project
               end
               def description=(arg)
                 if arg.is_a?(String)
                   arg = arg.gsub(/(\r\n|\n|\r)/, "\r\n")
                 end
                 write_attribute(:description, arg)
               end
               # Overrides assign_attributes so that project and tracker get assigned first
               def assign_attributes_with_project_and_tracker_first(new_attributes, *args)
                 return if new_attributes.nil?
                 attrs = new_attributes.dup
                 attrs.stringify_keys!
                 %w(project project_id tracker tracker_id).each do |attr|
                   if attrs.has_key?(attr)
                     send "#{attr}=", attrs.delete(attr)
                   end
                 end
                 send :assign_attributes_without_project_and_tracker_first, attrs, *args
               end
               # Do not redefine alias chain on reload (see #4838)
               alias_method_chain(:assign_attributes, :project_and_tracker_first) unless method_defined?(:assign_attributes_without_project_and_tracker_first)
               def attributes=(new_attributes)
                 assign_attributes new_attributes
               end
               def estimated_hours=(h)
                 write_attribute :estimated_hours, (h.is_a?(String) ? h.to_hours : h)
               end
               safe_attributes 'project_id',
                 :if => lambda {|issue, user|
                   if issue.new_record?
                     issue.copy?
                   elsif user.allowed_to?(:move_issues, issue.project)
                     Issue.allowed_target_projects_on_move.count > 1
                   end
                 }
               safe_attributes 'tracker_id',
                 'status_id',
                 'category_id',
                 'assigned_to_id',
                 'priority_id',
                 'fixed_version_id',
                 'subject',
                 'description',
                 'start_date',
                 'due_date',
                 'done_ratio',
                 'estimated_hours',
                 'custom_field_values',
                 'custom_fields',
                 'lock_version',
                 'notes',
                 :if => lambda {|issue, user| issue.new_record? || user.allowed_to?(:edit_issues, issue.project) }
               safe_attributes 'status_id',
                 'assigned_to_id',
                 'fixed_version_id',
                 'done_ratio',
                 'lock_version',
                 'notes',
                 :if => lambda {|issue, user| issue.new_statuses_allowed_to(user).any? }
               safe_attributes 'notes',
                 :if => lambda {|issue, user| user.allowed_to?(:add_issue_notes, issue.project)}
               safe_attributes 'private_notes',
                 :if => lambda {|issue, user| !issue.new_record? && user.allowed_to?(:set_notes_private, issue.project)}
               safe_attributes 'watcher_user_ids',
                 :if => lambda {|issue, user| issue.new_record? && user.allowed_to?(:add_issue_watchers, issue.project)}
               safe_attributes 'is_private',
                 :if => lambda {|issue, user|
                   user.allowed_to?(:set_issues_private, issue.project) ||
                     (issue.author_id == user.id && user.allowed_to?(:set_own_issues_private, issue.project))
                 }
               safe_attributes 'parent_issue_id',
                 :if => lambda {|issue, user| (issue.new_record? || user.allowed_to?(:edit_issues, issue.project)) &&
                   user.allowed_to?(:manage_subtasks, issue.project)}
               def safe_attribute_names(user=nil)
                 names = super
                 names -= disabled_core_fields
                 names -= read_only_attribute_names(user)
                 names
               end
               # Safely sets attributes
               # Should be called from controllers instead of #attributes=
               # attr_accessible is too rough because we still want things like
               # Issue.new(:project => foo) to work
               def safe_attributes=(attrs, user=User.current)
                 return unless attrs.is_a?(Hash)
                 attrs = attrs.deep_dup
                 # Project and Tracker must be set before since new_statuses_allowed_to depends on it.
                 if (p = attrs.delete('project_id')) && safe_attribute?('project_id')
                   if allowed_target_projects(user).where(:id => p.to_i).exists?
                     self.project_id = p
                   end
                 end
                 if (t = attrs.delete('tracker_id')) && safe_attribute?('tracker_id')
                   self.tracker_id = t
                 end
                 if (s = attrs.delete('status_id')) && safe_attribute?('status_id')
                   if new_statuses_allowed_to(user).collect(&:id).include?(s.to_i)
                     self.status_id = s
                   end
                 end
                 attrs = delete_unsafe_attributes(attrs, user)
                 return if attrs.empty?
                 unless leaf?
                   attrs.reject! {|k,v| %w(priority_id done_ratio start_date due_date estimated_hours).include?(k)}
                 end
                 if attrs['parent_issue_id'].present?
                   s = attrs['parent_issue_id'].to_s
                   unless (m = s.match(%r{\A#?(\d+)\z})) && (m[1] == parent_id.to_s || Issue.visible(user).exists?(m[1]))
                     @invalid_parent_issue_id = attrs.delete('parent_issue_id')
                   end
                 end
                 if attrs['custom_field_values'].present?
                   editable_custom_field_ids = editable_custom_field_values(user).map {|v| v.custom_field_id.to_s}
                   attrs['custom_field_values'].select! {|k, v| editable_custom_field_ids.include?(k.to_s)}
                 end
                 if attrs['custom_fields'].present?
                   editable_custom_field_ids = editable_custom_field_values(user).map {|v| v.custom_field_id.to_s}
                   attrs['custom_fields'].select! {|c| editable_custom_field_ids.include?(c['id'].to_s)}
                 end
                 # mass-assignment security bypass
                 assign_attributes attrs, :without_protection => true
               end
               def disabled_core_fields
                 tracker ? tracker.disabled_core_fields : []
               end
               # Returns the custom_field_values that can be edited by the given user
               def editable_custom_field_values(user=nil)
                 visible_custom_field_values(user).reject do |value|
                   read_only_attribute_names(user).include?(value.custom_field_id.to_s)
                 end
               end
               # Returns the custom fields that can be edited by the given user
               def editable_custom_fields(user=nil)
                 editable_custom_field_values(user).map(&:custom_field).uniq
               end
               # Returns the names of attributes that are read-only for user or the current user
               # For users with multiple roles, the read-only fields are the intersection of
               # read-only fields of each role
               # The result is an array of strings where sustom fields are represented with their ids
               #
               # Examples:
               #   issue.read_only_attribute_names # => ['due_date', '2']
               #   issue.read_only_attribute_names(user) # => []
               def read_only_attribute_names(user=nil)
                 workflow_rule_by_attribute(user).reject {|attr, rule| rule != 'readonly'}.keys
               end
               # Returns the names of required attributes for user or the current user
               # For users with multiple roles, the required fields are the intersection of
               # required fields of each role
               # The result is an array of strings where sustom fields are represented with their ids
               #
               # Examples:
               #   issue.required_attribute_names # => ['due_date', '2']
               #   issue.required_attribute_names(user) # => []
               def required_attribute_names(user=nil)
                 workflow_rule_by_attribute(user).reject {|attr, rule| rule != 'required'}.keys
               end
               # Returns true if the attribute is required for user
               def required_attribute?(name, user=nil)
                 required_attribute_names(user).include?(name.to_s)
               end
               # Returns a hash of the workflow rule by attribute for the given user
               #
               # Examples:
               #   issue.workflow_rule_by_attribute # => {'due_date' => 'required', 'start_date' => 'readonly'}
               def workflow_rule_by_attribute(user=nil)
                 return @workflow_rule_by_attribute if @workflow_rule_by_attribute && user.nil?
                 user_real = user || User.current
                 roles = user_real.admin ? Role.all.to_a : user_real.roles_for_project(project)
                 return {} if roles.empty?
                 result = {}
                 workflow_permissions = WorkflowPermission.where(:tracker_id => tracker_id, :old_status_id => status_id, :role_id => roles.map(&:id)).to_a
                 if workflow_permissions.any?
                   workflow_rules = workflow_permissions.inject({}) do |h, wp|
                     h[wp.field_name] ||= []
                     h[wp.field_name] << wp.rule
                     h
                   end
                   workflow_rules.each do |attr, rules|
                     next if rules.size < roles.size
                     uniq_rules = rules.uniq
                     if uniq_rules.size == 1
                       result[attr] = uniq_rules.first
                     else
                       result[attr] = 'required'
                     end
                   end
                 end
                 @workflow_rule_by_attribute = result if user.nil?
                 result
               end
               private :workflow_rule_by_attribute
               def done_ratio
                 if Issue.use_status_for_done_ratio? && status && status.default_done_ratio
                   status.default_done_ratio
                 else
                   read_attribute(:done_ratio)
                 end
               end
               def self.use_status_for_done_ratio?
                 Setting.issue_done_ratio == 'issue_status'
               end
               def self.use_field_for_done_ratio?
                 Setting.issue_done_ratio == 'issue_field'
               end
               def validate_issue
                 if due_date && start_date && (start_date_changed? || due_date_changed?) && due_date < start_date
                   errors.add :due_date, :greater_than_start_date
                 end
                 if start_date && start_date_changed? && soonest_start && start_date < soonest_start
                   errors.add :start_date, :earlier_than_minimum_start_date, :date => format_date(soonest_start)
                 end
                 if fixed_version
                   if !assignable_versions.include?(fixed_version)
                     errors.add :fixed_version_id, :inclusion
                   elsif reopening? && fixed_version.closed?
                     errors.add :base, I18n.t(:error_can_not_reopen_issue_on_closed_version)
                   end
                 end
                 # Checks that the issue can not be added/moved to a disabled tracker
                 if project && (tracker_id_changed? || project_id_changed?)
                   unless project.trackers.include?(tracker)
                     errors.add :tracker_id, :inclusion
                   end
                 end
                 # Checks parent issue assignment
                 if @invalid_parent_issue_id.present?
                   errors.add :parent_issue_id, :invalid
                 elsif @parent_issue
                   if !valid_parent_project?(@parent_issue)
                     errors.add :parent_issue_id, :invalid
                   elsif (@parent_issue != parent) && (all_dependent_issues.include?(@parent_issue) || @parent_issue.all_dependent_issues.include?(self))
                     errors.add :parent_issue_id, :invalid
                   elsif !new_record?
                     # moving an existing issue
                     if @parent_issue.root_id != root_id
                       # we can always move to another tree
                     elsif move_possible?(@parent_issue)
                       # move accepted inside tree
                     else
                       errors.add :parent_issue_id, :invalid
                     end
                   end
                 end
               end
               # Validates the issue against additional workflow requirements
               def validate_required_fields
                 user = new_record? ? author : current_journal.try(:user)
                 required_attribute_names(user).each do |attribute|
                   if attribute =~ /^\d+$/
                     attribute = attribute.to_i
                     v = custom_field_values.detect {|v| v.custom_field_id == attribute }
                     if v && v.value.blank?
                       errors.add :base, v.custom_field.name + ' ' + l('activerecord.errors.messages.blank')
                     end
                   else
                     if respond_to?(attribute) && send(attribute).blank? && !disabled_core_fields.include?(attribute)
                       errors.add attribute, :blank
                     end
                   end
                 end
               end
               # Set the done_ratio using the status if that setting is set.  This will keep the done_ratios
               # even if the user turns off the setting later
               def update_done_ratio_from_issue_status
                 if Issue.use_status_for_done_ratio? && status && status.default_done_ratio
                   self.done_ratio = status.default_done_ratio
                 end
               end
               def init_journal(user, notes = "")
                 @current_journal ||= Journal.new(:journalized => self, :user => user, :notes => notes)
               end
               # Returns the current journal or nil if it's not initialized
               def current_journal
                 @current_journal
               end
               # Returns the names of attributes that are journalized when updating the issue
               def journalized_attribute_names
                 Issue.column_names - %w(id root_id lft rgt lock_version created_on updated_on closed_on)
               end
               # Returns the id of the last journal or nil
               def last_journal_id
                 if new_record?
                   nil
                 else
                   journals.maximum(:id)
                 end
               end
               # Returns a scope for journals that have an id greater than journal_id
               def journals_after(journal_id)
                 scope = journals.reorder("#{Journal.table_name}.id ASC")
                 if journal_id.present?
                   scope = scope.where("#{Journal.table_name}.id > ?", journal_id.to_i)
                 end
                 scope
               end
               # Returns the initial status of the issue
               # Returns nil for a new issue
               def status_was
                 if status_id_changed?
                   if status_id_was.to_i > 0
                     @status_was ||= IssueStatus.find_by_id(status_id_was)
                   end
                 else
                   @status_was ||= status
                 end
               end
               # Return true if the issue is closed, otherwise false
               def closed?
                 status.present? && status.is_closed?
               end
               # Returns true if the issue was closed when loaded
               def was_closed?
                 status_was.present? && status_was.is_closed?
               end
               # Return true if the issue is being reopened
               def reopening?
                 if new_record?
                   false
                 else
                   status_id_changed? && !closed? && was_closed?
                 end
               end
               alias :reopened? :reopening?
               # Return true if the issue is being closed
               def closing?
                 if new_record?
                   closed?
                 else
                   status_id_changed? && closed? && !was_closed?
                 end
               end
               # Returns true if the issue is overdue
               def overdue?
                 due_date.present? && (due_date < Date.today) && !closed?
               end
               # Is the amount of work done less than it should for the due date
               def behind_schedule?
                 return false if start_date.nil? || due_date.nil?
                 done_date = start_date + ((due_date - start_date + 1) * done_ratio / 100).floor
                 return done_date <= Date.today
               end
               # Does this issue have children?
               def children?
                 !leaf?
               end
               # Users the issue can be assigned to
               def assignable_users
                 users = project.assignable_users.to_a
                 users << author if author
                 users << assigned_to if assigned_to
                 users.uniq.sort
               end
               # Versions that the issue can be assigned to
               def assignable_versions
                 return @assignable_versions if @assignable_versions
                 versions = project.shared_versions.open.to_a
                 if fixed_version
                   if fixed_version_id_changed?
                     # nothing to do
                   elsif project_id_changed?
                     if project.shared_versions.include?(fixed_version)
                       versions << fixed_version
                     end
                   else
                     versions << fixed_version
                   end
                 end
                 @assignable_versions = versions.uniq.sort
               end
               # Returns true if this issue is blocked by another issue that is still open
               def blocked?
                 !relations_to.detect {|ir| ir.relation_type == 'blocks' && !ir.issue_from.closed?}.nil?
               end
               # Returns the default status of the issue based on its tracker
               # Returns nil if tracker is nil
               def default_status
                 tracker.try(:default_status)
               end
               # Returns an array of statuses that user is able to apply
               def new_statuses_allowed_to(user=User.current, include_default=false)
                 if new_record? && @copied_from
                   [default_status, @copied_from.status].compact.uniq.sort
                 else
                   initial_status = nil
                   if new_record?
                     initial_status = default_status
                   elsif tracker_id_changed?
                     if Tracker.where(:id => tracker_id_was, :default_status_id => status_id_was).any?
                       initial_status = default_status
                     elsif tracker.issue_status_ids.include?(status_id_was)
                       initial_status = IssueStatus.find_by_id(status_id_was)
                     else
                       initial_status = default_status
                     end
                   else
                     initial_status = status_was
                   end
                   initial_assigned_to_id = assigned_to_id_changed? ? assigned_to_id_was : assigned_to_id
                   assignee_transitions_allowed = initial_assigned_to_id.present? &&
                     (user.id == initial_assigned_to_id || user.group_ids.include?(initial_assigned_to_id))
                   statuses = []
                   if initial_status
                     statuses += initial_status.find_new_statuses_allowed_to(
                       user.admin ? Role.all.to_a : user.roles_for_project(project),
                       tracker,
                       author == user,
                       assignee_transitions_allowed
                       )
                   end
                   statuses << initial_status unless statuses.empty?
                   statuses << default_status if include_default
                   statuses = statuses.compact.uniq.sort
                   if blocked?
                     statuses.reject!(&:is_closed?)
                   end
                   statuses
                 end
               end
               # Returns the previous assignee if changed
               def assigned_to_was
                 # assigned_to_id_was is reset before after_save callbacks
                 user_id = @previous_assigned_to_id || assigned_to_id_was
                 if user_id && user_id != assigned_to_id
                   @assigned_to_was ||= User.find_by_id(user_id)
                 end
               end
               # Returns the users that should be notified
               def notified_users
                 notified = []
                 # Author and assignee are always notified unless they have been
                 # locked or don't want to be notified
                 notified << author if author
                 if assigned_to
                   notified += (assigned_to.is_a?(Group) ? assigned_to.users : [assigned_to])
                 end
                 if assigned_to_was
                   notified += (assigned_to_was.is_a?(Group) ? assigned_to_was.users : [assigned_to_was])
                 end
                 notified = notified.select {|u| u.active? && u.notify_about?(self)}
                 notified += project.notified_users
                 notified.uniq!
                 # Remove users that can not view the issue
                 notified.reject! {|user| !visible?(user)}
                 notified
               end
               # Returns the email addresses that should be notified
               def recipients
                 notified_users.collect(&:mail)
               end
               def each_notification(users, &block)
                 if users.any?
                   if custom_field_values.detect {|value| !value.custom_field.visible?}
                     users_by_custom_field_visibility = users.group_by do |user|
                       visible_custom_field_values(user).map(&:custom_field_id).sort
                     end
                     users_by_custom_field_visibility.values.each do |users|
                       yield(users)
                     end
                   else
                     yield(users)
                   end
                 end
               end
               # Returns the number of hours spent on this issue
               def spent_hours
                 @spent_hours ||= time_entries.sum(:hours) || 0
               end
               # Returns the total number of hours spent on this issue and its descendants
               #
               # Example:
               #   spent_hours => 0.0
               #   spent_hours => 50.2
               def total_spent_hours
                 @total_spent_hours ||=
                   self_and_descendants.
                     joins("LEFT JOIN #{TimeEntry.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id").
                     sum("#{TimeEntry.table_name}.hours").to_f || 0.0
               end
               def relations
                 @relations ||= IssueRelation::Relations.new(self, (relations_from + relations_to).sort)
               end
               # Preloads relations for a collection of issues
               def self.load_relations(issues)
                 if issues.any?
                   relations = IssueRelation.where("issue_from_id IN (:ids) OR issue_to_id IN (:ids)", :ids => issues.map(&:id)).all
                   issues.each do |issue|
                     issue.instance_variable_set "@relations", relations.select {|r| r.issue_from_id == issue.id || r.issue_to_id == issue.id}
                   end
                 end
               end
               # Preloads visible spent time for a collection of issues
               def self.load_visible_spent_hours(issues, user=User.current)
                 if issues.any?
                   hours_by_issue_id = TimeEntry.visible(user).group(:issue_id).sum(:hours)
                   issues.each do |issue|
                     issue.instance_variable_set "@spent_hours", (hours_by_issue_id[issue.id] || 0)
                   end
                 end
               end
               # Preloads visible relations for a collection of issues
               def self.load_visible_relations(issues, user=User.current)
                 if issues.any?
                   issue_ids = issues.map(&:id)
                   # Relations with issue_from in given issues and visible issue_to
                   relations_from = IssueRelation.joins(:issue_to => :project).
                                      where(visible_condition(user)).where(:issue_from_id => issue_ids).to_a
                   # Relations with issue_to in given issues and visible issue_from
                   relations_to = IssueRelation.joins(:issue_from => :project).
                                      where(visible_condition(user)).
                                      where(:issue_to_id => issue_ids).to_a
                   issues.each do |issue|
                     relations =
                       relations_from.select {|relation| relation.issue_from_id == issue.id} +
                       relations_to.select {|relation| relation.issue_to_id == issue.id}
                     issue.instance_variable_set "@relations", IssueRelation::Relations.new(issue, relations.sort)
                   end
                 end
               end
               # Finds an issue relation given its id.
               def find_relation(relation_id)
                 IssueRelation.where("issue_to_id = ? OR issue_from_id = ?", id, id).find(relation_id)
               end
               # Returns all the other issues that depend on the issue
               # The algorithm is a modified breadth first search (bfs)
               def all_dependent_issues(except=[])
                 # The found dependencies
                 dependencies = []
                 # The visited flag for every node (issue) used by the breadth first search
                 eNOT_DISCOVERED         = 0       # The issue is "new" to the algorithm, it has not seen it before.
                 ePROCESS_ALL            = 1       # The issue is added to the queue. Process both children and relations of
                                                   # the issue when it is processed.
                 ePROCESS_RELATIONS_ONLY = 2       # The issue was added to the queue and will be output as dependent issue,
                                                   # but its children will not be added to the queue when it is processed.
                 eRELATIONS_PROCESSED    = 3       # The related issues, the parent issue and the issue itself have been added to
                                                   # the queue, but its children have not been added.
                 ePROCESS_CHILDREN_ONLY  = 4       # The relations and the parent of the issue have been added to the queue, but
                                                   # the children still need to be processed.
                 eALL_PROCESSED          = 5       # The issue and all its children, its parent and its related issues have been
                                                   # added as dependent issues. It needs no further processing.
                 issue_status = Hash.new(eNOT_DISCOVERED)
                 # The queue
                 queue = []
                 # Initialize the bfs, add start node (self) to the queue
                 queue << self
                 issue_status[self] = ePROCESS_ALL
                 while (!queue.empty?) do
                   current_issue = queue.shift
                   current_issue_status = issue_status[current_issue]
                   dependencies << current_issue
                   # Add parent to queue, if not already in it.
                   parent = current_issue.parent
                   parent_status = issue_status[parent]
                   if parent && (parent_status == eNOT_DISCOVERED) && !except.include?(parent)
                     queue << parent
                     issue_status[parent] = ePROCESS_RELATIONS_ONLY
                   end
                   # Add children to queue, but only if they are not already in it and
                   # the children of the current node need to be processed.
                   if (current_issue_status == ePROCESS_CHILDREN_ONLY || current_issue_status == ePROCESS_ALL)
                     current_issue.children.each do |child|
                       next if except.include?(child)
                       if (issue_status[child] == eNOT_DISCOVERED)
                         queue << child
                         issue_status[child] = ePROCESS_ALL
                       elsif (issue_status[child] == eRELATIONS_PROCESSED)
                         queue << child
                         issue_status[child] = ePROCESS_CHILDREN_ONLY
                       elsif (issue_status[child] == ePROCESS_RELATIONS_ONLY)
                         queue << child
                         issue_status[child] = ePROCESS_ALL
                       end
                     end
                   end
                   # Add related issues to the queue, if they are not already in it.
                   current_issue.relations_from.map(&:issue_to).each do |related_issue|
                     next if except.include?(related_issue)
                     if (issue_status[related_issue] == eNOT_DISCOVERED)
                       queue << related_issue
                       issue_status[related_issue] = ePROCESS_ALL
                     elsif (issue_status[related_issue] == eRELATIONS_PROCESSED)
                       queue << related_issue
                       issue_status[related_issue] = ePROCESS_CHILDREN_ONLY
                     elsif (issue_status[related_issue] == ePROCESS_RELATIONS_ONLY)
                       queue << related_issue
                       issue_status[related_issue] = ePROCESS_ALL
                     end
                   end
                   # Set new status for current issue
                   if (current_issue_status == ePROCESS_ALL) || (current_issue_status == ePROCESS_CHILDREN_ONLY)
                     issue_status[current_issue] = eALL_PROCESSED
                   elsif (current_issue_status == ePROCESS_RELATIONS_ONLY)
                     issue_status[current_issue] = eRELATIONS_PROCESSED
                   end
                 end # while
                 # Remove the issues from the "except" parameter from the result array
                 dependencies -= except
                 dependencies.delete(self)
                 dependencies
               end
               # Returns an array of issues that duplicate this one
               def duplicates
                 relations_to.select {|r| r.relation_type == IssueRelation::TYPE_DUPLICATES}.collect {|r| r.issue_from}
               end
               # Returns the due date or the target due date if any
               # Used on gantt chart
               def due_before
                 due_date || (fixed_version ? fixed_version.effective_date : nil)
               end
               # Returns the time scheduled for this issue.
               #
               # Example:
               #   Start Date: 2/26/09, End Date: 3/04/09
               #   duration => 6
               def duration
                 (start_date && due_date) ? due_date - start_date : 0
               end
               # Returns the duration in working days
               def working_duration
                 (start_date && due_date) ? working_days(start_date, due_date) : 0
               end
               def soonest_start(reload=false)
                 @soonest_start = nil if reload
                 @soonest_start ||= (
                     relations_to(reload).collect{|relation| relation.successor_soonest_start} +
                     [(@parent_issue || parent).try(:soonest_start)]
                   ).compact.max
               end
               # Sets start_date on the given date or the next working day
               # and changes due_date to keep the same working duration.
               def reschedule_on(date)
                 wd = working_duration
                 date = next_working_date(date)
                 self.start_date = date
                 self.due_date = add_working_days(date, wd)
               end
               # Reschedules the issue on the given date or the next working day and saves the record.
               # If the issue is a parent task, this is done by rescheduling its subtasks.
               def reschedule_on!(date)
                 return if date.nil?
                 if leaf?
                   if start_date.nil? || start_date != date
                     if start_date && start_date > date
                       # Issue can not be moved earlier than its soonest start date
                       date = [soonest_start(true), date].compact.max
                     end
                     reschedule_on(date)
                     begin
                       save
                     rescue ActiveRecord::StaleObjectError
                       reload
                       reschedule_on(date)
                       save
                     end
                   end
                 else
                   leaves.each do |leaf|
                     if leaf.start_date
                       # Only move subtask if it starts at the same date as the parent
                       # or if it starts before the given date
                       if start_date == leaf.start_date || date > leaf.start_date
                         leaf.reschedule_on!(date)
                       end
                     else
                       leaf.reschedule_on!(date)
                     end
                   end
                 end
               end
               def <=>(issue)
                 if issue.nil?
                   -1
                 elsif root_id != issue.root_id
                   (root_id || 0) <=> (issue.root_id || 0)
                 else
                   (lft || 0) <=> (issue.lft || 0)
                 end
               end
               def to_s
                 "#{tracker} ##{id}: #{subject}"
               end
               # Returns a string of css classes that apply to the issue
               def css_classes(user=User.current)
                 s = "issue tracker-#{tracker_id} status-#{status_id} #{priority.try(:css_classes)}"
                 s << ' closed' if closed?
                 s << ' overdue' if overdue?
                 s << ' child' if child?
                 s << ' parent' unless leaf?
                 s << ' private' if is_private?
                 if user.logged?
                   s << ' created-by-me' if author_id == user.id
                   s << ' assigned-to-me' if assigned_to_id == user.id
                   s << ' assigned-to-my-group' if user.groups.any? {|g| g.id == assigned_to_id}
                 end
                 s
               end
               # Unassigns issues from +version+ if it's no longer shared with issue's project
               def self.update_versions_from_sharing_change(version)
                 # Update issues assigned to the version
                 update_versions(["#{Issue.table_name}.fixed_version_id = ?", version.id])
               end
               # Unassigns issues from versions that are no longer shared
               # after +project+ was moved
               def self.update_versions_from_hierarchy_change(project)
                 moved_project_ids = project.self_and_descendants.reload.collect(&:id)
                 # Update issues of the moved projects and issues assigned to a version of a moved project
                 Issue.update_versions(
                         ["#{Version.table_name}.project_id IN (?) OR #{Issue.table_name}.project_id IN (?)",
                          moved_project_ids, moved_project_ids]
                       )
               end
               def parent_issue_id=(arg)
                 s = arg.to_s.strip.presence
                 if s && (m = s.match(%r{\A#?(\d+)\z})) && (@parent_issue = Issue.find_by_id(m[1]))
                   @invalid_parent_issue_id = nil
                 elsif s.blank?
                   @parent_issue = nil
                   @invalid_parent_issue_id = nil
                 else
                   @parent_issue = nil
                   @invalid_parent_issue_id = arg
                 end
               end
               def parent_issue_id
                 if @invalid_parent_issue_id
                   @invalid_parent_issue_id
                 elsif instance_variable_defined? :@parent_issue
                   @parent_issue.nil? ? nil : @parent_issue.id
                 else
                   parent_id
                 end
               end
               # Returns true if issue's project is a valid
               # parent issue project
               def valid_parent_project?(issue=parent)
                 return true if issue.nil? || issue.project_id == project_id
                 case Setting.cross_project_subtasks
                 when 'system'
                   true
                 when 'tree'
                   issue.project.root == project.root
                 when 'hierarchy'
                   issue.project.is_or_is_ancestor_of?(project) || issue.project.is_descendant_of?(project)
                 when 'descendants'
                   issue.project.is_or_is_ancestor_of?(project)
                 else
                   false
                 end
               end
               # Returns an issue scope based on project and scope
               def self.cross_project_scope(project, scope=nil)
                 if project.nil?
                   return Issue
                 end
                 case scope
                 when 'all', 'system'
                   Issue
                 when 'tree'
                   Issue.joins(:project).where("(#{Project.table_name}.lft >= :lft AND #{Project.table_name}.rgt <= :rgt)",
                                               :lft => project.root.lft, :rgt => project.root.rgt)
                 when 'hierarchy'
                   Issue.joins(:project).where("(#{Project.table_name}.lft >= :lft AND #{Project.table_name}.rgt <= :rgt) OR (#{Project.table_name}.lft < :lft AND #{Project.table_name}.rgt > :rgt)",
                                               :lft => project.lft, :rgt => project.rgt)
                 when 'descendants'
                   Issue.joins(:project).where("(#{Project.table_name}.lft >= :lft AND #{Project.table_name}.rgt <= :rgt)",
                                               :lft => project.lft, :rgt => project.rgt)
                 else
                   Issue.where(:project_id => project.id)
                 end
               end
               def self.by_tracker(project)
                 count_and_group_by(:project => project, :association => :tracker)
               end
               def self.by_version(project)
                 count_and_group_by(:project => project, :association => :fixed_version)
               end
               def self.by_priority(project)
                 count_and_group_by(:project => project, :association => :priority)
               end
               def self.by_category(project)
                 count_and_group_by(:project => project, :association => :category)
               end
               def self.by_assigned_to(project)
                 count_and_group_by(:project => project, :association => :assigned_to)
               end
               def self.by_author(project)
                 count_and_group_by(:project => project, :association => :author)
               end
               def self.by_subproject(project)
                 r = count_and_group_by(:project => project, :with_subprojects => true, :association => :project)
                 r.reject {|r| r["project_id"] == project.id.to_s}
               end
               # Query generator for selecting groups of issue counts for a project
               # based on specific criteria
               #
               # Options
               # * project - Project to search in.
               # * with_subprojects - Includes subprojects issues if set to true.
               # * association - Symbol. Association for grouping.
               def self.count_and_group_by(options)
                 assoc = reflect_on_association(options[:association])
                 select_field = assoc.foreign_key
                 Issue.
                   visible(User.current, :project => options[:project], :with_subprojects => options[:with_subprojects]).
                   joins(:status, assoc.name).
                   group(:status_id, :is_closed, select_field).
                   count.
                   map do |columns, total|
                     status_id, is_closed, field_value = columns
                     is_closed = ['t', 'true', '1'].include?(is_closed.to_s)
                     {
                       "status_id" => status_id.to_s,
                       "closed" => is_closed,
                       select_field => field_value.to_s,
                       "total" => total.to_s
                     }
                   end
               end
               # Returns a scope of projects that user can assign the issue to
               def allowed_target_projects(user=User.current)
                 if new_record?
                   Project.where(Project.allowed_to_condition(user, :add_issues))
                 else
                   self.class.allowed_target_projects_on_move(user)
                 end
               end
               # Returns a scope of projects that user can move issues to
               def self.allowed_target_projects_on_move(user=User.current)
                 Project.where(Project.allowed_to_condition(user, :move_issues))
               end
               private
               def after_project_change
                 # Update project_id on related time entries
                 TimeEntry.where({:issue_id => id}).update_all(["project_id = ?", project_id])
                 # Delete issue relations
                 unless Setting.cross_project_issue_relations?
                   relations_from.clear
                   relations_to.clear
                 end
                 # Move subtasks that were in the same project
                 children.each do |child|
                   next unless child.project_id == project_id_was
                   # Change project and keep project
                   child.send :project=, project, true
                   unless child.save
                     raise ActiveRecord::Rollback
                   end
                 end
               end
               # Callback for after the creation of an issue by copy
               # * adds a "copied to" relation with the copied issue
               # * copies subtasks from the copied issue
               def after_create_from_copy
                 return unless copy? && !@after_create_from_copy_handled
                 if (@copied_from.project_id == project_id || Setting.cross_project_issue_relations?) && @copy_options[:link] != false
                   if @current_journal
                     @copied_from.init_journal(@current_journal.user)
                   end
                   relation = IssueRelation.new(:issue_from => @copied_from, :issue_to => self, :relation_type => IssueRelation::TYPE_COPIED_TO)
                   unless relation.save
                     logger.error "Could not create relation while copying ##{@copied_from.id} to ##{id} due to validation errors: #{relation.errors.full_messages.join(', ')}" if logger
                   end
                 end
                 unless @copied_from.leaf? || @copy_options[:subtasks] == false
                   copy_options = (@copy_options || {}).merge(:subtasks => false)
                   copied_issue_ids = {@copied_from.id => self.id}
                   @copied_from.reload.descendants.reorder("#{Issue.table_name}.lft").each do |child|
                     # Do not copy self when copying an issue as a descendant of the copied issue
                     next if child == self
                     # Do not copy subtasks of issues that were not copied
                     next unless copied_issue_ids[child.parent_id]
                     # Do not copy subtasks that are not visible to avoid potential disclosure of private data
                     unless child.visible?
                       logger.error "Subtask ##{child.id} was not copied during ##{@copied_from.id} copy because it is not visible to the current user" if logger
                       next
                     end
                     copy = Issue.new.copy_from(child, copy_options)
                     if @current_journal
                       copy.init_journal(@current_journal.user)
                     end
                     copy.author = author
                     copy.project = project
                     copy.parent_issue_id = copied_issue_ids[child.parent_id]
                     unless copy.save
                       logger.error "Could not copy subtask ##{child.id} while copying ##{@copied_from.id} to ##{id} due to validation errors: #{copy.errors.full_messages.join(', ')}" if logger
                       next
                     end
                     copied_issue_ids[child.id] = copy.id
                   end
                 end
                 @after_create_from_copy_handled = true
               end
               def update_nested_set_attributes
                 if root_id.nil?
                   # issue was just created
                   self.root_id = (@parent_issue.nil? ? id : @parent_issue.root_id)
                   Issue.where(["id = ?", id]).update_all(["root_id = ?", root_id])
                   if @parent_issue
                     move_to_child_of(@parent_issue)
                   end
                 elsif parent_issue_id != parent_id
                   update_nested_set_attributes_on_parent_change
                 end
                 remove_instance_variable(:@parent_issue) if instance_variable_defined?(:@parent_issue)
               end
               # Updates the nested set for when an existing issue is moved
               def update_nested_set_attributes_on_parent_change
                 former_parent_id = parent_id
                 # moving an existing issue
                 if @parent_issue && @parent_issue.root_id == root_id
                   # inside the same tree
                   move_to_child_of(@parent_issue)
                 else
                   # to another tree
                   unless root?
                     move_to_right_of(root)
                   end
                   old_root_id = root_id
                   in_tenacious_transaction do
                     @parent_issue.reload_nested_set if @parent_issue
                     self.reload_nested_set
                     self.root_id = (@parent_issue.nil? ? id : @parent_issue.root_id)
                     cond = ["root_id = ? AND lft >= ? AND rgt <= ? ", old_root_id, lft, rgt]
                     self.class.base_class.select('id').lock(true).where(cond)
                     offset = rdm_right_most_bound + 1 - lft
                     Issue.where(cond).
                       update_all(["root_id = ?, lft = lft + ?, rgt = rgt + ?", root_id, offset, offset])
                   end
                   if @parent_issue
                     move_to_child_of(@parent_issue)
                   end
                 end
                 # delete invalid relations of all descendants
                 self_and_descendants.each do |issue|
                   issue.relations.each do |relation|
                     relation.destroy unless relation.valid?
                   end
                 end
                 # update former parent
                 recalculate_attributes_for(former_parent_id) if former_parent_id
               end
               def rdm_right_most_bound
                 right_most_node =
                   self.class.base_class.unscoped.
                     order("#{quoted_right_column_full_name} desc").limit(1).lock(true).first
                   right_most_node ? (right_most_node[right_column_name] || 0 ) : 0
               end
               private :rdm_right_most_bound
               def update_parent_attributes
                 recalculate_attributes_for(parent_id) if parent_id
               end
               def recalculate_attributes_for(issue_id)
                 if issue_id && p = Issue.find_by_id(issue_id)
                   # priority = highest priority of children
                   if priority_position = p.children.joins(:priority).maximum("#{IssuePriority.table_name}.position")
                     p.priority = IssuePriority.find_by_position(priority_position)
                   end
                   # start/due dates = lowest/highest dates of children
                   p.start_date = p.children.minimum(:start_date)
                   p.due_date = p.children.maximum(:due_date)
                   if p.start_date && p.due_date && p.due_date < p.start_date
                     p.start_date, p.due_date = p.due_date, p.start_date
                   end
                   # done ratio = weighted average ratio of leaves
                   unless Issue.use_status_for_done_ratio? && p.status && p.status.default_done_ratio
                     leaves_count = p.leaves.count
                     if leaves_count > 0
                       average = p.leaves.where("estimated_hours > 0").average(:estimated_hours).to_f
                       if average == 0
                         average = 1
                       end
                       done = p.leaves.joins(:status).
                         sum("COALESCE(CASE WHEN estimated_hours > 0 THEN estimated_hours ELSE NULL END, #{average}) " +
                             "* (CASE WHEN is_closed = #{self.class.connection.quoted_true} THEN 100 ELSE COALESCE(done_ratio, 0) END)").to_f
                       progress = done / (average * leaves_count)
                       p.done_ratio = progress.round
                     end
                   end
                   # estimate = sum of leaves estimates
                   p.estimated_hours = p.leaves.sum(:estimated_hours).to_f
                   p.estimated_hours = nil if p.estimated_hours == 0.0
                   # ancestors will be recursively updated
                   p.save(:validate => false)
                 end
               end
               # Update issues so their versions are not pointing to a
               # fixed_version that is not shared with the issue's project
               def self.update_versions(conditions=nil)
                 # Only need to update issues with a fixed_version from
                 # a different project and that is not systemwide shared
                 Issue.joins(:project, :fixed_version).
                   where("#{Issue.table_name}.fixed_version_id IS NOT NULL" +
                     " AND #{Issue.table_name}.project_id <> #{Version.table_name}.project_id" +
                     " AND #{Version.table_name}.sharing <> 'system'").
                   where(conditions).each do |issue|
                   next if issue.project.nil? || issue.fixed_version.nil?
                   unless issue.project.shared_versions.include?(issue.fixed_version)
                     issue.init_journal(User.current)
                     issue.fixed_version = nil
                     issue.save
                   end
                 end
               end
               # Callback on file attachment
               def attachment_added(attachment)
                 if current_journal && !attachment.new_record?
                   current_journal.journalize_attachment(attachment, :added)
                 end
               end
               # Callback on attachment deletion
               def attachment_removed(attachment)
                 if current_journal && !attachment.new_record?
                   current_journal.journalize_attachment(attachment, :removed)
                   current_journal.save
                 end
               end
               # Called after a relation is added
               def relation_added(relation)
                 if current_journal
                   current_journal.journalize_relation(relation, :added)
                   current_journal.save
                 end
               end
               # Called after a relation is removed
               def relation_removed(relation)
                 if current_journal
                   current_journal.journalize_relation(relation, :removed)
                   current_journal.save
                 end
               end
               # Default assignment based on category
               def default_assign
                 if assigned_to.nil? && category && category.assigned_to
                   self.assigned_to = category.assigned_to
                 end
               end
               # Updates start/due dates of following issues
               def reschedule_following_issues
                 if start_date_changed? || due_date_changed?
                   relations_from.each do |relation|
                     relation.set_issue_to_dates
                   end
                 end
               end
               # Closes duplicates if the issue is being closed
               def close_duplicates
                 if closing?
                   duplicates.each do |duplicate|
                     # Reload is needed in case the duplicate was updated by a previous duplicate
                     duplicate.reload
                     # Don't re-close it if it's already closed
                     next if duplicate.closed?
                     # Same user and notes
                     if @current_journal
                       duplicate.init_journal(@current_journal.user, @current_journal.notes)
                     end
                     duplicate.update_attribute :status, self.status
                   end
                 end
               end
               # Make sure updated_on is updated when adding a note and set updated_on now
               # so we can set closed_on with the same value on closing
               def force_updated_on_change
                 if @current_journal || changed?
                   self.updated_on = current_time_from_proper_timezone
                   if new_record?
                     self.created_on = updated_on
                   end
                 end
               end
               # Callback for setting closed_on when the issue is closed.
               # The closed_on attribute stores the time of the last closing
               # and is preserved when the issue is reopened.
               def update_closed_on
                 if closing?
                   self.closed_on = updated_on
                 end
               end
               # Saves the changes in a Journal
               # Called after_save
               def create_journal
                 if current_journal
                   current_journal.save
                 end
               end
               def send_notification
                 if Setting.notified_events.include?('issue_added')
                   Mailer.deliver_issue_add(self)
                 end
               end
               # Stores the previous assignee so we can still have access
               # to it during after_save callbacks (assigned_to_id_was is reset)
               def set_assigned_to_was
                 @previous_assigned_to_id = assigned_to_id_was
               end
               # Clears the previous assignee at the end of after_save callbacks
               def clear_assigned_to_was
                 @assigned_to_was = nil
                 @previous_assigned_to_id = nil
               end
             end

app/models/message.rb +3 -3

             # Redmine - project management software
             # Copyright (C) 2006-2014  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Message < ActiveRecord::Base
               include Redmine::SafeAttributes
               belongs_to :board
               belongs_to :author, :class_name => 'User'
               acts_as_tree :counter_cache => :replies_count, :order => "#{Message.table_name}.created_on ASC"
               acts_as_attachable
               belongs_to :last_reply, :class_name => 'Message'
               attr_protected :id
               acts_as_searchable :columns => ['subject', 'content'],
-                                 :scope => preload(:board => :project),
+                                 :preload => {:board => :project},
-                                 :project_key => "#{Board.table_name}.project_id",
+                                 :project_key => "#{Board.table_name}.project_id"
-                                 :date_column => "#{table_name}.created_on"
               acts_as_event :title => Proc.new {|o| "#{o.board.name}: #{o.subject}"},
                             :description => :content,
                             :group => :parent,
                             :type => Proc.new {|o| o.parent_id.nil? ? 'message' : 'reply'},
                             :url => Proc.new {|o| {:controller => 'messages', :action => 'show', :board_id => o.board_id}.merge(o.parent_id.nil? ? {:id => o.id} :
                                                                                                                                                    {:id => o.parent_id, :r => o.id, :anchor => "message-#{o.id}"})}
               acts_as_activity_provider :scope => preload({:board => :project}, :author),
                                         :author_key => :author_id
               acts_as_watchable
               validates_presence_of :board, :subject, :content
               validates_length_of :subject, :maximum => 255
               validate :cannot_reply_to_locked_topic, :on => :create
               after_create :add_author_as_watcher, :reset_counters!
               after_update :update_messages_board
               after_destroy :reset_counters!
               after_create :send_notification
               scope :visible, lambda {|*args|
                 joins(:board => :project).
                 where(Project.allowed_to_condition(args.shift || User.current, :view_messages, *args))
               }
               safe_attributes 'subject', 'content'
               safe_attributes 'locked', 'sticky', 'board_id',
                 :if => lambda {|message, user|
                   user.allowed_to?(:edit_messages, message.project)
                 }
               def visible?(user=User.current)
                 !user.nil? && user.allowed_to?(:view_messages, project)
               end
               def cannot_reply_to_locked_topic
                 # Can not reply to a locked topic
                 errors.add :base, 'Topic is locked' if root.locked? && self != root
               end
               def update_messages_board
                 if board_id_changed?
                   Message.where(["id = ? OR parent_id = ?", root.id, root.id]).update_all({:board_id => board_id})
                   Board.reset_counters!(board_id_was)
                   Board.reset_counters!(board_id)
                 end
               end
               def reset_counters!
                 if parent && parent.id
                   Message.where({:id => parent.id}).update_all({:last_reply_id => parent.children.maximum(:id)})
                 end
                 board.reset_counters!
               end
               def sticky=(arg)
                 write_attribute :sticky, (arg == true || arg.to_s == '1' ? 1 : 0)
               end
               def sticky?
                 sticky == 1
               end
               def project
                 board.project
               end
               def editable_by?(usr)
                 usr && usr.logged? && (usr.allowed_to?(:edit_messages, project) || (self.author == usr && usr.allowed_to?(:edit_own_messages, project)))
               end
               def destroyable_by?(usr)
                 usr && usr.logged? && (usr.allowed_to?(:delete_messages, project) || (self.author == usr && usr.allowed_to?(:delete_own_messages, project)))
               end
               private
               def add_author_as_watcher
                 Watcher.create(:watchable => self.root, :user => author)
               end
               def send_notification
                 if Setting.notified_events.include?('message_posted')
                   Mailer.message_posted(self).deliver
                 end
               end
             end

app/models/news.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2014  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class News < ActiveRecord::Base
               include Redmine::SafeAttributes
               belongs_to :project
               belongs_to :author, :class_name => 'User'
               has_many :comments, lambda {order("created_on")}, :as => :commented, :dependent => :delete_all
               validates_presence_of :title, :description
               validates_length_of :title, :maximum => 60
               validates_length_of :summary, :maximum => 255
               attr_protected :id
               acts_as_attachable :edit_permission => :manage_news,
                                  :delete_permission => :manage_news
               acts_as_searchable :columns => ['title', 'summary', "#{table_name}.description"],
-                                 :scope => preload(:project)
+                                 :preload => :project
               acts_as_event :url => Proc.new {|o| {:controller => 'news', :action => 'show', :id => o.id}}
               acts_as_activity_provider :scope => preload(:project, :author),
                                         :author_key => :author_id
               acts_as_watchable
               after_create :add_author_as_watcher
               after_create :send_notification
               scope :visible, lambda {|*args|
                 joins(:project).
                 where(Project.allowed_to_condition(args.shift || User.current, :view_news, *args))
               }
               safe_attributes 'title', 'summary', 'description'
               def visible?(user=User.current)
                 !user.nil? && user.allowed_to?(:view_news, project)
               end
               # Returns true if the news can be commented by user
               def commentable?(user=User.current)
                 user.allowed_to?(:comment_news, project)
               end
               def recipients
                 project.users.select {|user| user.notify_about?(self) && user.allowed_to?(:view_news, project)}.map(&:mail)
               end
               # Returns the email addresses that should be cc'd when a new news is added
               def cc_for_added_news
                 cc = []
                 if m = project.enabled_module('news')
                   cc = m.notified_watchers
                   unless project.is_public?
                     cc = cc.select {|user| project.users.include?(user)}
                   end
                 end
                 cc.map(&:mail)
               end
               # returns latest news for projects visible by user
               def self.latest(user = User.current, count = 5)
                 visible(user).preload(:author, :project).order("#{News.table_name}.created_on DESC").limit(count).to_a
               end
               private
               def add_author_as_watcher
                 Watcher.create(:watchable => self, :user => author)
               end
               def send_notification
                 if Setting.notified_events.include?('news_added')
                   Mailer.news_added(self).deliver
                 end
               end
             end

app/models/wiki_page.rb +2 -1

             # Redmine - project management software
             # Copyright (C) 2006-2014  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'diff'
             require 'enumerator'
             class WikiPage < ActiveRecord::Base
               include Redmine::SafeAttributes
               belongs_to :wiki
               has_one :content, :class_name => 'WikiContent', :foreign_key => 'page_id', :dependent => :destroy
               acts_as_attachable :delete_permission => :delete_wiki_pages_attachments
               acts_as_tree :dependent => :nullify, :order => 'title'
               acts_as_watchable
               acts_as_event :title => Proc.new {|o| "#{l(:label_wiki)}: #{o.title}"},
                             :description => :text,
                             :datetime => :created_on,
                             :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.wiki.project, :id => o.title}}
               acts_as_searchable :columns => ['title', "#{WikiContent.table_name}.text"],
-                                 :scope => preload(:wiki => :project).joins(:content, {:wiki => :project}),
+                                 :scope => joins(:content, {:wiki => :project}),
+                                 :preload => {:wiki => :project},
                                  :permission => :view_wiki_pages,
                                  :project_key => "#{Wiki.table_name}.project_id"
               attr_accessor :redirect_existing_links
               validates_presence_of :title
               validates_format_of :title, :with => /\A[^,\.\/\?\;\|\s]*\z/
               validates_uniqueness_of :title, :scope => :wiki_id, :case_sensitive => false
               validates_associated :content
               attr_protected :id
               validate :validate_parent_title
               before_destroy :delete_redirects
               before_save :handle_rename_or_move
               after_save :handle_children_move
               # eager load information about last updates, without loading text
               scope :with_updated_on, lambda {
                 select("#{WikiPage.table_name}.*, #{WikiContent.table_name}.updated_on, #{WikiContent.table_name}.version").
                   joins("LEFT JOIN #{WikiContent.table_name} ON #{WikiContent.table_name}.page_id = #{WikiPage.table_name}.id")
               }
               # Wiki pages that are protected by default
               DEFAULT_PROTECTED_PAGES = %w(sidebar)
               safe_attributes 'parent_id', 'parent_title', 'title', 'redirect_existing_links', 'wiki_id',
                 :if => lambda {|page, user| page.new_record? || user.allowed_to?(:rename_wiki_pages, page.project)}
               def initialize(attributes=nil, *args)
                 super
                 if new_record? && DEFAULT_PROTECTED_PAGES.include?(title.to_s.downcase)
                   self.protected = true
                 end
               end
               def visible?(user=User.current)
                 !user.nil? && user.allowed_to?(:view_wiki_pages, project)
               end
               def title=(value)
                 value = Wiki.titleize(value)
                 write_attribute(:title, value)
               end
               def safe_attributes=(attrs, user=User.current)
                 return unless attrs.is_a?(Hash)
                 attrs = attrs.deep_dup
                 # Project and Tracker must be set before since new_statuses_allowed_to depends on it.
                 if (w_id = attrs.delete('wiki_id')) && safe_attribute?('wiki_id')
                   if (w = Wiki.find_by_id(w_id)) && w.project && user.allowed_to?(:rename_wiki_pages, w.project)
                     self.wiki = w
                   end
                 end
                 super attrs, user
               end
               # Manages redirects if page is renamed or moved
               def handle_rename_or_move
                 if !new_record? && (title_changed? || wiki_id_changed?)
                   # Update redirects that point to the old title
                   WikiRedirect.where(:redirects_to => title_was, :redirects_to_wiki_id => wiki_id_was).each do |r|
                     r.redirects_to = title
                     r.redirects_to_wiki_id = wiki_id
                     (r.title == r.redirects_to && r.wiki_id == r.redirects_to_wiki_id) ? r.destroy : r.save
                   end
                   # Remove redirects for the new title
                   WikiRedirect.where(:wiki_id => wiki_id, :title => title).delete_all
                   # Create a redirect to the new title
                   unless redirect_existing_links == "0"
                     WikiRedirect.create(
                       :wiki_id => wiki_id_was, :title => title_was,
                       :redirects_to_wiki_id => wiki_id, :redirects_to => title
                     )
                   end
                 end
                 if !new_record? && wiki_id_changed? && parent.present?
                   unless parent.wiki_id == wiki_id
                     self.parent_id = nil
                   end
                 end
               end
               private :handle_rename_or_move
               # Moves child pages if page was moved
               def handle_children_move
                 if !new_record? && wiki_id_changed?
                   children.each do |child|
                     child.wiki_id = wiki_id
                     child.redirect_existing_links = redirect_existing_links
                     unless child.save
                       WikiPage.where(:id => child.id).update_all :parent_nil => nil
                     end
                   end
                 end
               end
               private :handle_children_move
               # Deletes redirects to this page
               def delete_redirects
                 WikiRedirect.where(:redirects_to_wiki_id => wiki_id, :redirects_to => title).delete_all
               end
               def pretty_title
                 WikiPage.pretty_title(title)
               end
               def content_for_version(version=nil)
                 if content
                   result = content.versions.find_by_version(version.to_i) if version
                   result ||= content
                   result
                 end
               end
               def diff(version_to=nil, version_from=nil)
                 version_to = version_to ? version_to.to_i : self.content.version
                 content_to = content.versions.find_by_version(version_to)
                 content_from = version_from ? content.versions.find_by_version(version_from.to_i) : content_to.try(:previous)
                 return nil unless content_to && content_from
                 if content_from.version > content_to.version
                   content_to, content_from = content_from, content_to
                 end
                 (content_to && content_from) ? WikiDiff.new(content_to, content_from) : nil
               end
               def annotate(version=nil)
                 version = version ? version.to_i : self.content.version
                 c = content.versions.find_by_version(version)
                 c ? WikiAnnotate.new(c) : nil
               end
               def self.pretty_title(str)
                 (str && str.is_a?(String)) ? str.tr('_', ' ') : str
               end
               def project
                 wiki.try(:project)
               end
               def text
                 content.text if content
               end
               def updated_on
                 unless @updated_on
                   if time = read_attribute(:updated_on)
                     # content updated_on was eager loaded with the page
                     begin
                       @updated_on = (self.class.default_timezone == :utc ? Time.parse(time.to_s).utc : Time.parse(time.to_s).localtime)
                     rescue
                     end
                   else
                     @updated_on = content && content.updated_on
                   end
                 end
                 @updated_on
               end
               # Returns true if usr is allowed to edit the page, otherwise false
               def editable_by?(usr)
                 !protected? || usr.allowed_to?(:protect_wiki_pages, wiki.project)
               end
               def attachments_deletable?(usr=User.current)
                 editable_by?(usr) && super(usr)
               end
               def parent_title
                 @parent_title || (self.parent && self.parent.pretty_title)
               end
               def parent_title=(t)
                 @parent_title = t
                 parent_page = t.blank? ? nil : self.wiki.find_page(t)
                 self.parent = parent_page
               end
               # Saves the page and its content if text was changed
               # Return true if the page was saved
               def save_with_content(content)
                 ret = nil
                 transaction do
                   ret = save
                   if content.text_changed?
                     begin
                       self.content = content
                       ret = ret && content.changed?
                     rescue ActiveRecord::RecordNotSaved
                       ret = false
                     end
                   end
                   raise ActiveRecord::Rollback unless ret
                 end
                 ret
               end
               protected
               def validate_parent_title
                 errors.add(:parent_title, :invalid) if !@parent_title.blank? && parent.nil?
                 errors.add(:parent_title, :circular_dependency) if parent && (parent == self || parent.ancestors.include?(self))
                 if parent_id_changed? && parent && (parent.wiki_id != wiki_id)
                   errors.add(:parent_title, :not_same_project)
                 end
               end
             end
             class WikiDiff < Redmine::Helpers::Diff
               attr_reader :content_to, :content_from
               def initialize(content_to, content_from)
                 @content_to = content_to
                 @content_from = content_from
                 super(content_to.text, content_from.text)
               end
             end
             class WikiAnnotate
               attr_reader :lines, :content
               def initialize(content)
                 @content = content
                 current = content
                 current_lines = current.text.split(/\r?\n/)
                 @lines = current_lines.collect {|t| [nil, nil, t]}
                 positions = []
                 current_lines.size.times {|i| positions << i}
                 while (current.previous)
                   d = current.previous.text.split(/\r?\n/).diff(current.text.split(/\r?\n/)).diffs.flatten
                   d.each_slice(3) do |s|
                     sign, line = s[0], s[1]
                     if sign == '+' && positions[line] && positions[line] != -1
                       if @lines[positions[line]][0].nil?
                         @lines[positions[line]][0] = current.version
                         @lines[positions[line]][1] = current.author
                       end
                     end
                   end
                   d.each_slice(3) do |s|
                     sign, line = s[0], s[1]
                     if sign == '-'
                       positions.insert(line, -1)
                     else
                       positions[line] = nil
                     end
                   end
                   positions.compact!
                   # Stop if every line is annotated
                   break unless @lines.detect { |line| line[0].nil? }
                   current = current.previous
                 end
                 @lines.each { |line|
                   line[0] ||= current.version
                   # if the last known version is > 1 (eg. history was cleared), we don't know the author
                   line[1] ||= current.author if current.version == 1
                 }
               end
             end

app/views/search/index.html.erb +4 -13

             <h2><%= l(:label_search) %></h2>
             <div class="box">
             <%= form_tag({}, :method => :get, :id => 'search-form') do %>
             <%= label_tag "search-input", l(:description_search), :class => "hidden-for-sighted" %>
             <p><%= text_field_tag 'q', @question, :size => 60, :id => 'search-input' %>
             <%= project_select_tag %>
             <%= hidden_field_tag 'all_words', '', :id => nil %>
             <label><%= check_box_tag 'all_words', 1, @all_words %> <%= l(:label_all_words) %></label>
             <%= hidden_field_tag 'titles_only', '', :id => nil %>
             <label><%= check_box_tag 'titles_only', 1, @titles_only %> <%= l(:label_search_titles_only) %></label>
             </p>
             <p id="search-types">
             <% @object_types.each do |t| %>
             <label><%= check_box_tag t, 1, @scope.include?(t) %> <%= link_to type_label(t), "#" %></label>
             <% end %>
             </p>
             <p><%= submit_tag l(:button_submit) %></p>
             <% end %>
             </div>
             <% if @results %>
                 <div id="search-results-counts">
-                  <%= render_results_by_type(@results_by_type) unless @scope.size == 1 %>
+                  <%= render_results_by_type(@result_count_by_type) unless @scope.size == 1 %>
                 </div>
-                <h3><%= l(:label_result_plural) %> (<%= @results_by_type.values.sum %>)</h3>
+                <h3><%= l(:label_result_plural) %> (<%= @result_count %>)</h3>
                 <dl id="search-results">
                   <% @results.each do |e| %>
                     <dt class="<%= e.event_type %>">
                       <%= content_tag('span', h(e.project), :class => 'project') unless @project == e.project %>
                       <%= link_to(highlight_tokens(e.event_title.truncate(255), @tokens), e.event_url) %>
                     </dt>
                     <dd><span class="description"><%= highlight_tokens(e.event_description, @tokens) %></span>
                     <span class="author"><%= format_time(e.event_datetime) %></span></dd>
                   <% end %>
                 </dl>
             <% end %>
-            <p class="pagination">
+            <% if @result_pages %>
-            <% if @pagination_previous_date %>
+            <p class="pagination"><%= pagination_links_full @result_pages, @result_count, :per_page_links => false %></p>
-            <%= link_to_content_update("\xc2\xab " + l(:label_previous),
-                  params.merge(:previous => 1,
-                               :offset => @pagination_previous_date.strftime("%Y%m%d%H%M%S"))) %>&nbsp;
             <% end %>
-            <% if @pagination_next_date %>
-            <%= link_to_content_update(l(:label_next) + " \xc2\xbb",
-                  params.merge(:previous => nil,
-                               :offset => @pagination_next_date.strftime("%Y%m%d%H%M%S"))) %>
-            <% end %>
-            </p>
             <% html_title(l(:label_search)) -%>
             <%= javascript_tag do %>
             $("#search-types a").click(function(e){
               e.preventDefault();
               $("#search-types input[type=checkbox]").prop('checked', false);
               $(this).siblings("input[type=checkbox]").prop('checked', true);
               if ($("#search-input").val() != "") {
                 $("#search-form").submit();
               }
             });
             <% end %>

lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb +45 -37

             # Redmine - project management software
             # Copyright (C) 2006-2014  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module Redmine
               module Acts
                 module Searchable
                   def self.included(base)
                     base.extend ClassMethods
                   end
                   module ClassMethods
+                    # Adds the search methods to the class.
+                    #
                     # Options:
                     # * :columns - a column or an array of columns to search
                     # * :project_key - project foreign key (default to project_id)
-                    # * :date_column - name of the datetime column (default to created_on)
+                    # * :date_column - name of the datetime column used to sort results (default to :created_on)
-                    # * :sort_order - name of the column used to sort results (default to :date_column or created_on)
+                    # * :permission - permission required to search the model
-                    # * :permission - permission required to search the model (default to :view_"objects")
+                    # * :scope - scope used to search results
+                    # * :preload - associations to preload when loading results for display
                     def acts_as_searchable(options = {})
                       return if self.included_modules.include?(Redmine::Acts::Searchable::InstanceMethods)
-                      options.assert_valid_keys(:columns, :project_key, :date_column, :order_column, :search_custom_fields, :permission, :scope)
+                      options.assert_valid_keys(:columns, :project_key, :date_column, :permission, :scope, :preload)
                       cattr_accessor :searchable_options
                       self.searchable_options = options
                       if searchable_options[:columns].nil?
                         raise 'No searchable column defined.'
                       elsif !searchable_options[:columns].is_a?(Array)
                         searchable_options[:columns] = [] << searchable_options[:columns]
                       end
                       searchable_options[:project_key] ||= "#{table_name}.project_id"
-                      searchable_options[:date_column] ||= "#{table_name}.created_on"
+                      searchable_options[:date_column] ||= :created_on
-                      searchable_options[:order_column] ||= searchable_options[:date_column]
                       # Should we search custom fields on this model ?
                       searchable_options[:search_custom_fields] = !reflect_on_association(:custom_values).nil?
                       send :include, Redmine::Acts::Searchable::InstanceMethods
                     end
                   end
                   module InstanceMethods
                     def self.included(base)
                       base.extend ClassMethods
                     end
                     module ClassMethods
-                      # Searches the model for the given tokens
+                      # Searches the model for the given tokens and user visibility.
-                      # projects argument can be either nil (will search all projects), a project or an array of projects
+                      # The projects argument can be either nil (will search all projects), a project or an array of projects.
-                      # Returns the results and the results count
+                      # Returns an array that contains the rank and id of all results.
-                      def search(tokens, projects=nil, options={})
+                      # In current implementation, the rank is the record timestamp.
+                      #
+                      # Valid options:
+                      # * :titles_only - searches tokens in the first searchable column only
+                      # * :all_words - searches results that match all token
+                      # * :limit - maximum number of results to return
+                      #
+                      # Example:
+                      #   Issue.search_result_ranks_and_ids("foo")
+                      #   # => [[Tue, 26 Jun 2007 22:16:00 UTC +00:00, 69], [Mon, 08 Oct 2007 14:31:00 UTC +00:00, 123]]
+                      def search_result_ranks_and_ids(tokens, user=User.current, projects=nil, options={})
                         if projects.is_a?(Array) && projects.empty?
                           # no results
-                          return [[], 0]
+                          return []
                         end
-                        # TODO: make user an argument
-                        user = User.current
                         tokens = [] << tokens unless tokens.is_a?(Array)
                         projects = [] << projects if projects.is_a?(Project)
-                        limit_options = {}
-                        limit_options[:limit] = options[:limit] if options[:limit]
                         columns = searchable_options[:columns]
                         columns = columns[0..0] if options[:titles_only]
                         token_clauses = columns.collect {|column| "(LOWER(#{column}) LIKE ?)"}
                         if !options[:titles_only] && searchable_options[:search_custom_fields]
                           searchable_custom_fields = CustomField.where(:type => "#{self.name}CustomField", :searchable => true)
                           fields_by_visibility = searchable_custom_fields.group_by {|field|
                             field.visibility_by_project_condition(searchable_options[:project_key], user, "cfs.custom_field_id")
                           }
                           # only 1 subquery for all custom fields with the same visibility statement
                           fields_by_visibility.each do |visibility, fields|
                             ids = fields.map(&:id).join(',')
                             sql = "#{table_name}.id IN (SELECT cfs.customized_id FROM #{CustomValue.table_name} cfs" +
                               " WHERE cfs.customized_type='#{self.name}' AND cfs.customized_id=#{table_name}.id AND LOWER(cfs.value) LIKE ?" +
                               " AND cfs.custom_field_id IN (#{ids})" +
                               " AND #{visibility})"
                             token_clauses << sql
                           end
                         end
                         sql = (['(' + token_clauses.join(' OR ') + ')'] * tokens.size).join(options[:all_words] ? ' AND ' : ' OR ')
                         tokens_conditions = [sql, * (tokens.collect {|w| "%#{w.downcase}%"} * token_clauses.size).sort]
                         scope = (searchable_options[:scope] || self)
                         if scope.is_a? Proc
                           scope = scope.call
                         end
-                        project_conditions = []
-                        if searchable_options.has_key?(:permission)
+                        if respond_to?(:visible) && !searchable_options.has_key?(:permission)
-                          project_conditions << Project.allowed_to_condition(user, searchable_options[:permission] || :view_project)
-                        elsif respond_to?(:visible)
                           scope = scope.visible(user)
                         else
-                          ActiveSupport::Deprecation.warn "acts_as_searchable with implicit :permission option is deprecated. Add a visible scope to the #{self.name} model or use explicit :permission option."
+                          permission = searchable_options[:permission] || :view_project
-                          project_conditions << Project.allowed_to_condition(user, "view_#{self.name.underscore.pluralize}".to_sym)
+                          scope = scope.where(Project.allowed_to_condition(user, permission))
                         end
                         # TODO: use visible scope options instead
-                        project_conditions << "#{searchable_options[:project_key]} IN (#{projects.collect(&:id).join(',')})" unless projects.nil?
+                        if projects
-                        project_conditions = project_conditions.empty? ? nil : project_conditions.join(' AND ')
+                          scope = scope.where("#{searchable_options[:project_key]} IN (?)", projects.map(&:id))
+                        end
                         results = []
                         results_count = 0
-                        scope = scope.
+                        scope.
-                          joins(searchable_options[:include]).
+                          reorder(searchable_options[:date_column] => :desc, :id => :desc).
-                          order("#{searchable_options[:order_column]} " + (options[:before] ? 'DESC' : 'ASC')).
-                          where(project_conditions).
                           where(tokens_conditions).
-                          uniq
+                          limit(options[:limit]).
+                          uniq.
-                        results_count = scope.count
+                          pluck(searchable_options[:date_column], :id)
+                      end
-                        scope_with_limit = scope.limit(options[:limit])
+                      # Returns search results of given ids
-                        if options[:offset]
+                      def search_results_from_ids(ids)
-                          scope_with_limit = scope_with_limit.where("#{searchable_options[:date_column]} #{options[:before] ? '<' : '>'} ?", options[:offset])
+                        where(:id => ids).preload(searchable_options[:preload]).to_a
-                        end
+                      end
-                        results = scope_with_limit.to_a
-                        [results, results_count]
+                      # Returns search results with same arguments as search_result_ranks_and_ids
+                      def search_results(*args)
+                        ranks_and_ids = search_result_ranks_and_ids(*args)
+                        search_results_from_ids(ranks_and_ids.map(&:last))
                       end
                     end
                   end
                 end
               end
             end

test/functional/search_controller_test.rb +17 -13

             # Redmine - project management software
             # Copyright (C) 2006-2014  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class SearchControllerTest < ActionController::TestCase
               fixtures :projects, :enabled_modules, :roles, :users, :members, :member_roles,
                        :issues, :trackers, :issue_statuses, :enumerations,
                        :custom_fields, :custom_values,
                        :custom_fields_projects, :custom_fields_trackers,
                        :repositories, :changesets
               def setup
                 User.current = nil
               end
               def test_search_for_projects
                 get :index
                 assert_response :success
                 assert_template 'index'
                 get :index, :q => "cook"
                 assert_response :success
                 assert_template 'index'
                 assert assigns(:results).include?(Project.find(1))
               end
               def test_search_on_archived_project_should_return_404
                 Project.find(3).archive
                 get :index, :id => 3
                 assert_response 404
               end
               def test_search_on_invisible_project_by_user_should_be_denied
                 @request.session[:user_id] = 7
                 get :index, :id => 2
                 assert_response 403
               end
               def test_search_on_invisible_project_by_anonymous_user_should_redirect
                 get :index, :id => 2
                 assert_response 302
               end
               def test_search_on_private_project_by_member_should_succeed
                 @request.session[:user_id] = 2
                 get :index, :id => 2
                 assert_response :success
               end
               def test_search_all_projects
                 with_settings :default_language => 'en' do
                   get :index, :q => 'recipe subproject commit', :all_words => ''
                 end
                 assert_response :success
                 assert_template 'index'
                 assert assigns(:results).include?(Issue.find(2))
                 assert assigns(:results).include?(Issue.find(5))
                 assert assigns(:results).include?(Changeset.find(101))
                 assert_select 'dt.issue a', :text => /Add ingredients categories/
                 assert_select 'dd', :text => /should be classified by categories/
-                assert assigns(:results_by_type).is_a?(Hash)
+                assert assigns(:result_count_by_type).is_a?(Hash)
-                assert_equal 5, assigns(:results_by_type)['changesets']
+                assert_equal 5, assigns(:result_count_by_type)['changesets']
                 assert_select 'a', :text => 'Changesets (5)'
               end
               def test_search_issues
                 get :index, :q => 'issue', :issues => 1
                 assert_response :success
                 assert_template 'index'
                 assert_equal true, assigns(:all_words)
                 assert_equal false, assigns(:titles_only)
                 assert assigns(:results).include?(Issue.find(8))
                 assert assigns(:results).include?(Issue.find(5))
                 assert_select 'dt.issue.closed a',  :text => /Closed/
               end
               def test_search_issues_should_search_notes
                 Journal.create!(:journalized => Issue.find(2), :notes => 'Issue notes with searchkeyword')
                 get :index, :q => 'searchkeyword', :issues => 1
                 assert_response :success
                 assert_include Issue.find(2), assigns(:results)
               end
               def test_search_issues_with_multiple_matches_in_journals_should_return_issue_once
                 Journal.create!(:journalized => Issue.find(2), :notes => 'Issue notes with searchkeyword')
                 Journal.create!(:journalized => Issue.find(2), :notes => 'Issue notes with searchkeyword')
                 get :index, :q => 'searchkeyword', :issues => 1
                 assert_response :success
                 assert_include Issue.find(2), assigns(:results)
                 assert_equal 1, assigns(:results).size
               end
               def test_search_issues_should_search_private_notes_with_permission_only
                 Journal.create!(:journalized => Issue.find(2), :notes => 'Private notes with searchkeyword', :private_notes => true)
                 @request.session[:user_id] = 2
                 Role.find(1).add_permission! :view_private_notes
                 get :index, :q => 'searchkeyword', :issues => 1
                 assert_response :success
                 assert_include Issue.find(2), assigns(:results)
                 Role.find(1).remove_permission! :view_private_notes
                 get :index, :q => 'searchkeyword', :issues => 1
                 assert_response :success
                 assert_not_include Issue.find(2), assigns(:results)
               end
               def test_search_all_projects_with_scope_param
                 get :index, :q => 'issue', :scope => 'all'
                 assert_response :success
                 assert_template 'index'
                 assert assigns(:results).present?
               end
               def test_search_my_projects
                 @request.session[:user_id] = 2
                 get :index, :id => 1, :q => 'recipe subproject', :scope => 'my_projects', :all_words => ''
                 assert_response :success
                 assert_template 'index'
                 assert assigns(:results).include?(Issue.find(1))
                 assert !assigns(:results).include?(Issue.find(5))
               end
               def test_search_my_projects_without_memberships
                 # anonymous user has no memberships
                 get :index, :id => 1, :q => 'recipe subproject', :scope => 'my_projects', :all_words => ''
                 assert_response :success
                 assert_template 'index'
                 assert assigns(:results).empty?
               end
               def test_search_project_and_subprojects
                 get :index, :id => 1, :q => 'recipe subproject', :scope => 'subprojects', :all_words => ''
                 assert_response :success
                 assert_template 'index'
                 assert assigns(:results).include?(Issue.find(1))
                 assert assigns(:results).include?(Issue.find(5))
               end
               def test_search_without_searchable_custom_fields
                 CustomField.update_all "searchable = #{ActiveRecord::Base.connection.quoted_false}"
                 get :index, :id => 1
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:project)
                 get :index, :id => 1, :q => "can"
                 assert_response :success
                 assert_template 'index'
               end
               def test_search_with_searchable_custom_fields
                 get :index, :id => 1, :q => "stringforcustomfield"
                 assert_response :success
                 results = assigns(:results)
                 assert_not_nil results
                 assert_equal 1, results.size
                 assert results.include?(Issue.find(7))
               end
               def test_search_all_words
                 # 'all words' is on by default
                 get :index, :id => 1, :q => 'recipe updating saving', :all_words => '1'
                 assert_equal true, assigns(:all_words)
                 results = assigns(:results)
                 assert_not_nil results
                 assert_equal 1, results.size
                 assert results.include?(Issue.find(3))
               end
               def test_search_one_of_the_words
                 get :index, :id => 1, :q => 'recipe updating saving', :all_words => ''
                 assert_equal false, assigns(:all_words)
                 results = assigns(:results)
                 assert_not_nil results
                 assert_equal 3, results.size
                 assert results.include?(Issue.find(3))
               end
               def test_search_titles_only_without_result
                 get :index, :id => 1, :q => 'recipe updating saving', :titles_only => '1'
                 results = assigns(:results)
                 assert_not_nil results
                 assert_equal 0, results.size
               end
               def test_search_titles_only
                 get :index, :id => 1, :q => 'recipe', :titles_only => '1'
                 assert_equal true, assigns(:titles_only)
                 results = assigns(:results)
                 assert_not_nil results
                 assert_equal 2, results.size
               end
               def test_search_content
                 Issue.where(:id => 1).update_all("description = 'This is a searchkeywordinthecontent'")
                 get :index, :id => 1, :q => 'searchkeywordinthecontent', :titles_only => ''
                 assert_equal false, assigns(:titles_only)
                 results = assigns(:results)
                 assert_not_nil results
                 assert_equal 1, results.size
               end
-              def test_search_with_offset
+              def test_search_with_pagination
-                get :index, :q => 'coo', :offset => '20080806073000'
+                issue = (0..24).map {Issue.generate! :subject => 'search_with_limited_results'}.reverse
+                get :index, :q => 'search_with_limited_results'
                 assert_response :success
-                results = assigns(:results)
+                assert_equal issue[0..9], assigns(:results)
-                assert results.any?
-                assert results.map(&:event_datetime).max < '20080806T073000'.to_time
-              end
-              def test_search_previous_with_offset
+                get :index, :q => 'search_with_limited_results', :page => 2
-                get :index, :q => 'coo', :offset => '20080806073000', :previous => '1'
                 assert_response :success
-                results = assigns(:results)
+                assert_equal issue[10..19], assigns(:results)
-                assert results.any?
-                assert results.map(&:event_datetime).min >= '20080806T073000'.to_time
+                get :index, :q => 'search_with_limited_results', :page => 3
+                assert_response :success
+                assert_equal issue[20..24], assigns(:results)
+                get :index, :q => 'search_with_limited_results', :page => 4
+                assert_response :success
+                assert_equal [], assigns(:results)
               end
               def test_search_with_invalid_project_id
                 get :index, :id => 195, :q => 'recipe'
                 assert_response 404
                 assert_nil assigns(:results)
               end
               def test_quick_jump_to_issue
                 # issue of a public project
                 get :index, :q => "3"
                 assert_redirected_to '/issues/3'
                 # issue of a private project
                 get :index, :q => "4"
                 assert_response :success
                 assert_template 'index'
               end
               def test_large_integer
                 get :index, :q => '4615713488'
                 assert_response :success
                 assert_template 'index'
               end
               def test_tokens_with_quotes
                 get :index, :id => 1, :q => '"good bye" hello "bye bye"'
                 assert_equal ["good bye", "hello", "bye bye"], assigns(:tokens)
               end
               def test_results_should_be_escaped_once
                 assert Issue.find(1).update_attributes(:subject => '<subject> escaped_once', :description => '<description> escaped_once')
                 get :index, :q => 'escaped_once'
                 assert_response :success
                 assert_select '#search-results' do
                   assert_select 'dt.issue a', :text => /&lt;subject&gt;/
                   assert_select 'dd', :text => /&lt;description&gt;/
                 end
               end
               def test_keywords_should_be_highlighted
                 assert Issue.find(1).update_attributes(:subject => 'subject highlighted', :description => 'description highlighted')
                 get :index, :q => 'highlighted'
                 assert_response :success
                 assert_select '#search-results' do
                   assert_select 'dt.issue a span.highlight', :text => 'highlighted'
                   assert_select 'dd span.highlight', :text => 'highlighted'
                 end
               end
             end

test/unit/search_test.rb +24 -24

             # Redmine - project management software
             # Copyright (C) 2006-2014  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class SearchTest < ActiveSupport::TestCase
               fixtures :users,
                        :members,
                        :member_roles,
                        :projects,
                        :roles,
                        :enabled_modules,
                        :issues,
                        :trackers,
                        :journals,
                        :journal_details,
                        :repositories,
                        :changesets
               def setup
                 @project = Project.find(1)
                 @issue_keyword = '%unable to print recipes%'
                 @issue = Issue.find(1)
                 @changeset_keyword = '%very first commit%'
                 @changeset = Changeset.find(100)
               end
               def test_search_by_anonymous
                 User.current = nil
-                r = Issue.search(@issue_keyword).first
+                r = Issue.search_results(@issue_keyword)
                 assert r.include?(@issue)
-                r = Changeset.search(@changeset_keyword).first
+                r = Changeset.search_results(@changeset_keyword)
                 assert r.include?(@changeset)
                 # Removes the :view_changesets permission from Anonymous role
                 remove_permission Role.anonymous, :view_changesets
                 User.current = nil
-                r = Issue.search(@issue_keyword).first
+                r = Issue.search_results(@issue_keyword)
                 assert r.include?(@issue)
-                r = Changeset.search(@changeset_keyword).first
+                r = Changeset.search_results(@changeset_keyword)
                 assert !r.include?(@changeset)
                 # Make the project private
                 @project.update_attribute :is_public, false
-                r = Issue.search(@issue_keyword).first
+                r = Issue.search_results(@issue_keyword)
                 assert !r.include?(@issue)
-                r = Changeset.search(@changeset_keyword).first
+                r = Changeset.search_results(@changeset_keyword)
                 assert !r.include?(@changeset)
               end
               def test_search_by_user
                 User.current = User.find_by_login('rhill')
                 assert User.current.memberships.empty?
-                r = Issue.search(@issue_keyword).first
+                r = Issue.search_results(@issue_keyword)
                 assert r.include?(@issue)
-                r = Changeset.search(@changeset_keyword).first
+                r = Changeset.search_results(@changeset_keyword)
                 assert r.include?(@changeset)
                 # Removes the :view_changesets permission from Non member role
                 remove_permission Role.non_member, :view_changesets
                 User.current = User.find_by_login('rhill')
-                r = Issue.search(@issue_keyword).first
+                r = Issue.search_results(@issue_keyword)
                 assert r.include?(@issue)
-                r = Changeset.search(@changeset_keyword).first
+                r = Changeset.search_results(@changeset_keyword)
                 assert !r.include?(@changeset)
                 # Make the project private
                 @project.update_attribute :is_public, false
-                r = Issue.search(@issue_keyword).first
+                r = Issue.search_results(@issue_keyword)
                 assert !r.include?(@issue)
-                r = Changeset.search(@changeset_keyword).first
+                r = Changeset.search_results(@changeset_keyword)
                 assert !r.include?(@changeset)
               end
               def test_search_by_allowed_member
                 User.current = User.find_by_login('jsmith')
                 assert User.current.projects.include?(@project)
-                r = Issue.search(@issue_keyword).first
+                r = Issue.search_results(@issue_keyword)
                 assert r.include?(@issue)
-                r = Changeset.search(@changeset_keyword).first
+                r = Changeset.search_results(@changeset_keyword)
                 assert r.include?(@changeset)
                 # Make the project private
                 @project.update_attribute :is_public, false
-                r = Issue.search(@issue_keyword).first
+                r = Issue.search_results(@issue_keyword)
                 assert r.include?(@issue)
-                r = Changeset.search(@changeset_keyword).first
+                r = Changeset.search_results(@changeset_keyword)
                 assert r.include?(@changeset)
               end
               def test_search_by_unallowed_member
                 # Removes the :view_changesets permission from user's and non member role
                 remove_permission Role.find(1), :view_changesets
                 remove_permission Role.non_member, :view_changesets
                 User.current = User.find_by_login('jsmith')
                 assert User.current.projects.include?(@project)
-                r = Issue.search(@issue_keyword).first
+                r = Issue.search_results(@issue_keyword)
                 assert r.include?(@issue)
-                r = Changeset.search(@changeset_keyword).first
+                r = Changeset.search_results(@changeset_keyword)
                 assert !r.include?(@changeset)
                 # Make the project private
                 @project.update_attribute :is_public, false
-                r = Issue.search(@issue_keyword).first
+                r = Issue.search_results(@issue_keyword)
                 assert r.include?(@issue)
-                r = Changeset.search(@changeset_keyword).first
+                r = Changeset.search_results(@changeset_keyword)
                 assert !r.include?(@changeset)
               end
               def test_search_issue_with_multiple_hits_in_journals
-                i = Issue.find(1)
+                issue = Issue.find(1)
-                assert_equal 2, i.journals.where("notes LIKE '%notes%'").count
+                assert_equal 2, issue.journals.where("notes LIKE '%notes%'").count
-                r = Issue.search('%notes%').first
+                r = Issue.search_results('%notes%')
                 assert_equal 1, r.size
-                assert_equal i, r.first
+                assert_equal issue, r.first
               end
               private
               def remove_permission(role, permission)
                 role.permissions = role.permissions - [ permission ]
                 role.save
               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