jro_apps/redmine Commit - r1664:be2b8a62f4d0

Search engine: display total results count (#906) and count by result type....

Jean-Philippe Lang -

r1664:be2b8a62f4d0

parent child

Context file:

r1664:be2b8a62f4d0

Collapse all files

app/controllers/search_controller.rb +6 -1

             # redMine - project management software
             # Copyright (C) 2006  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
               layout 'base'
               before_filter :find_optional_project
               helper :messages
               include MessagesHelper
               def index
                 @question = params[:q] || ""
                 @question.strip!
                 @all_words = params[:all_words] || (params[:submit] ? false : true)
                 @titles_only = !params[:titles_only].nil?
                 projects_to_search =
                   case params[:scope]
                   when 'all'
                     nil
                   when 'my_projects'
                     User.current.memberships.collect(&:project)
                   when 'subprojects'
                     @project ? ([ @project ] + @project.active_children) : nil
                   else
                     @project
                   end
                 offset = nil
                 begin; offset = params[:offset].to_time if params[:offset]; rescue; end
                 # quick jump to an issue
                 if @question.match(/^#?(\d+)$/) && Issue.find_by_id($1, :include => :project, :conditions => Project.visible_by(User.current))
                   redirect_to :controller => "issues", :action => "show", :id => $1
                   return
                 end
                 @object_types = %w(issues news documents changesets wiki_pages messages projects)
                 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 3 character long
                 @tokens = @tokens.uniq.select {|w| w.length > 2 }
                 if !@tokens.empty?
                   # no more than 5 tokens to search for
                   @tokens.slice! 5..-1 if @tokens.size > 5
                   # strings used in sql like statement
                   like_tokens = @tokens.collect {|w| "%#{w.downcase}%"}
                   @results = []
+                  @results_by_type = Hash.new {|h,k| h[k] = 0}
                   limit = 10
                   @scope.each do |s|
-                    @results += s.singularize.camelcase.constantize.search(like_tokens, projects_to_search,
+                    r, c = s.singularize.camelcase.constantize.search(like_tokens, projects_to_search,
                       :all_words => @all_words,
                       :titles_only => @titles_only,
                       :limit => (limit+1),
                       :offset => offset,
                       :before => params[:previous].nil?)
+                    @results += r
+                    @results_by_type[s] += c
                   end
                   @results = @results.sort {|a,b| b.event_datetime <=> a.event_datetime}
                   if params[:previous].nil?
                     @pagination_previous_date = @results[0].event_datetime if offset && @results[0]
                     if @results.size > limit
                       @pagination_next_date = @results[limit-1].event_datetime
                       @results = @results[0, limit]
                     end
                   else
                     @pagination_next_date = @results[-1].event_datetime if offset && @results[-1]
                     if @results.size > limit
                       @pagination_previous_date = @results[-(limit)].event_datetime
                       @results = @results[-(limit), limit]
                     end
                   end
                 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/helpers/search_helper.rb +16 0

             # redMine - project management software
             # Copyright (C) 2006-2007  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 SearchHelper
               def highlight_tokens(text, tokens)
                 return text unless text && tokens && !tokens.empty?
                 regexp = Regexp.new "(#{tokens.join('|')})", Regexp::IGNORECASE
                 result = ''
                 text.split(regexp).each_with_index do |words, i|
                   if result.length > 1200
                     # maximum length of the preview reached
                     result << '...'
                     break
                   end
                   if i.even?
                     result << h(words.length > 100 ? "#{words[0..44]} ... #{words[-45..-1]}" : words)
                   else
                     t = (tokens.index(words.downcase) || 0) % 4
                     result << content_tag('span', h(words), :class => "highlight token-#{t}")
                   end
                 end
                 result
               end
+              def type_label(t)
+                l("label_#{t.singularize}_plural")
+              end
               def project_select_tag
                 options = [[l(:label_project_all), 'all']]
                 options << [l(:label_my_projects), 'my_projects'] unless User.current.memberships.empty?
                 options << [l(:label_and_its_subprojects, @project.name), 'subprojects'] unless @project.nil? || @project.active_children.empty?
                 options << [@project.name, ''] unless @project.nil?
                 select_tag('scope', options_for_select(options, params[:scope].to_s)) if options.size > 1
               end
+              def render_results_by_type(results_by_type)
+                links = []
+                # Sorts types by results count
+                results_by_type.keys.sort {|a, b| results_by_type[b] <=> results_by_type[a]}.each do |t|
+                  c = results_by_type[t]
+                  next if c == 0
+                  text = "#{type_label(t)} (#{c})"
+                  links << link_to(text, :q => params[:q], :titles_only => params[:title_only], :all_words => params[:all_words], :scope => params[:scope], t => 1)
+                end
+                ('<ul>' + links.map {|link| content_tag('li', link)}.join(' ') + '</ul>') unless links.empty?
+              end
             end

app/models/issue.rb +4 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  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
               belongs_to :project
               belongs_to :tracker
               belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'
               belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
               belongs_to :assigned_to, :class_name => 'User', :foreign_key => 'assigned_to_id'
               belongs_to :fixed_version, :class_name => 'Version', :foreign_key => 'fixed_version_id'
               belongs_to :priority, :class_name => 'Enumeration', :foreign_key => 'priority_id'
               belongs_to :category, :class_name => 'IssueCategory', :foreign_key => 'category_id'
               has_many :journals, :as => :journalized, :dependent => :destroy
               has_many :attachments, :as => :container, :dependent => :destroy
               has_many :time_entries, :dependent => :delete_all
               has_and_belongs_to_many :changesets, :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_customizable
               acts_as_watchable
-              acts_as_searchable :columns => ['subject', "#{table_name}.description"], :include => :project, :with => {:journal => :issue}
+              acts_as_searchable :columns => ['subject', "#{table_name}.description", "#{Journal.table_name}.notes"],
+                                 :include => [:project, :journals],
+                                 # sort by id so that limited eager loading doesn't break with postgresql
+                                 :order_column => "#{table_name}.id"
               acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id}: #{o.subject}"},
                             :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}}
               validates_presence_of :subject, :description, :priority, :project, :tracker, :author, :status
               validates_length_of :subject, :maximum => 255
               validates_inclusion_of :done_ratio, :in => 0..100
               validates_numericality_of :estimated_hours, :allow_nil => true
               def after_initialize
                 if new_record?
                   # set default values for new records only
                   self.status ||= IssueStatus.default
                   self.priority ||= Enumeration.default('IPRI')
                 end
               end
               # Overrides Redmine::Acts::Customizable::InstanceMethods#available_custom_fields
               def available_custom_fields
                 (project && tracker) ? project.all_issue_custom_fields.select {|c| tracker.custom_fields.include? c } : []
               end
               def copy_from(arg)
                 issue = arg.is_a?(Issue) ? arg : Issue.find(arg)
                 self.attributes = issue.attributes.dup
                 self.custom_values = issue.custom_values.collect {|v| v.clone}
                 self
               end
               # Move an issue to a new project and tracker
               def move_to(new_project, new_tracker = nil)
                 transaction do
                   if new_project && project_id != new_project.id
                     # delete issue relations
                     unless Setting.cross_project_issue_relations?
                       self.relations_from.clear
                       self.relations_to.clear
                     end
                     # issue is moved to another project
                     self.category = nil
                     self.fixed_version = nil
                     self.project = new_project
                   end
                   if new_tracker
                     self.tracker = new_tracker
                   end
                   if save
                     # Manually update project_id on related time entries
                     TimeEntry.update_all("project_id = #{new_project.id}", {:issue_id => id})
                   else
                     rollback_db_transaction
                     return false
                   end
                 end
                 return true
               end
               def priority_id=(pid)
                 self.priority = nil
                 write_attribute(:priority_id, pid)
               end
               def estimated_hours=(h)
                 write_attribute :estimated_hours, (h.is_a?(String) ? h.to_hours : h)
               end
               def validate
                 if self.due_date.nil? && @attributes['due_date'] && !@attributes['due_date'].empty?
                   errors.add :due_date, :activerecord_error_not_a_date
                 end
                 if self.due_date and self.start_date and self.due_date < self.start_date
                   errors.add :due_date, :activerecord_error_greater_than_start_date
                 end
                 if start_date && soonest_start && start_date < soonest_start
                   errors.add :start_date, :activerecord_error_invalid
                 end
               end
               def validate_on_create
                 errors.add :tracker_id, :activerecord_error_invalid unless project.trackers.include?(tracker)
               end
               def before_create
                 # default assignment based on category
                 if assigned_to.nil? && category && category.assigned_to
                   self.assigned_to = category.assigned_to
                 end
               end
               def before_save
                 if @current_journal
                   # attributes changes
                   (Issue.column_names - %w(id description)).each {|c|
                     @current_journal.details << JournalDetail.new(:property => 'attr',
                                                                   :prop_key => c,
                                                                   :old_value => @issue_before_change.send(c),
                                                                   :value => send(c)) unless send(c)==@issue_before_change.send(c)
                   }
                   # custom fields changes
                   custom_values.each {|c|
                     next if (@custom_values_before_change[c.custom_field_id]==c.value ||
                               (@custom_values_before_change[c.custom_field_id].blank? && c.value.blank?))
                     @current_journal.details << JournalDetail.new(:property => 'cf',
                                                                   :prop_key => c.custom_field_id,
                                                                   :old_value => @custom_values_before_change[c.custom_field_id],
                                                                   :value => c.value)
                   }
                   @current_journal.save
                 end
                 # Save the issue even if the journal is not saved (because empty)
                 true
               end
               def after_save
                 # Reload is needed in order to get the right status
                 reload
                 # Update start/due dates of following issues
                 relations_from.each(&:set_issue_to_dates)
                 # Close duplicates if the issue was closed
                 if @issue_before_change && !@issue_before_change.closed? && self.closed?
                   duplicates.each do |duplicate|
                     # Reload is need 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
                     duplicate.init_journal(@current_journal.user, @current_journal.notes)
                     duplicate.update_attribute :status, self.status
                   end
                 end
               end
               def init_journal(user, notes = "")
                 @current_journal ||= Journal.new(:journalized => self, :user => user, :notes => notes)
                 @issue_before_change = self.clone
                 @issue_before_change.status = self.status
                 @custom_values_before_change = {}
                 self.custom_values.each {|c| @custom_values_before_change.store c.custom_field_id, c.value }
                 @current_journal
               end
               # Return true if the issue is closed, otherwise false
               def closed?
                 self.status.is_closed?
               end
               # Users the issue can be assigned to
               def assignable_users
                 project.assignable_users
               end
               # Returns an array of status that user is able to apply
               def new_statuses_allowed_to(user)
                 statuses = status.find_new_statuses_allowed_to(user.role_for_project(project), tracker)
                 statuses << status unless statuses.empty?
                 statuses.uniq.sort
               end
               # Returns the mail adresses of users that should be notified for the issue
               def recipients
                 recipients = project.recipients
                 # Author and assignee are always notified unless they have been locked
                 recipients << author.mail if author && author.active?
                 recipients << assigned_to.mail if assigned_to && assigned_to.active?
                 recipients.compact.uniq
               end
               def spent_hours
                 @spent_hours ||= time_entries.sum(:hours) || 0
               end
               def relations
                 (relations_from + relations_to).sort
               end
               def all_dependent_issues
                 dependencies = []
                 relations_from.each do |relation|
                   dependencies << relation.issue_to
                   dependencies += relation.issue_to.all_dependent_issues
                 end
                 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
               def duration
                 (start_date && due_date) ? due_date - start_date : 0
               end
               def soonest_start
                 @soonest_start ||= relations_to.collect{|relation| relation.successor_soonest_start}.compact.min
               end
               def self.visible_by(usr)
                 with_scope(:find => { :conditions => Project.visible_by(usr) }) do
                   yield
                 end
               end
               def to_s
                 "#{tracker} ##{id}: #{subject}"
               end
             end

app/models/journal.rb 0 -6

             # redMine - project management software
             # Copyright (C) 2006  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 Journal < ActiveRecord::Base
               belongs_to :journalized, :polymorphic => true
               # added as a quick fix to allow eager loading of the polymorphic association
               # since always associated to an issue, for now
               belongs_to :issue, :foreign_key => :journalized_id
               belongs_to :user
               has_many :details, :class_name => "JournalDetail", :dependent => :delete_all
               attr_accessor :indice
-              acts_as_searchable :columns => 'notes',
-                                 :include => {:issue => :project},
-                                 :project_key => "#{Issue.table_name}.project_id",
-                                 :date_column => "#{Issue.table_name}.created_on",
-                                 :permission => :view_issues
               acts_as_event :title => Proc.new {|o| status = ((s = o.new_status) ? " (#{s})" : nil); "#{o.issue.tracker} ##{o.issue.id}#{status}: #{o.issue.subject}" },
                             :description => :notes,
                             :author => :user,
                             :type => Proc.new {|o| (s = o.new_status) ? (s.is_closed? ? 'issue-closed' : 'issue-edit') : 'issue-note' },
                             :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.issue.id, :anchor => "change-#{o.id}"}}
               def save
                 # Do not save an empty journal
                 (details.empty? && notes.blank?) ? false : super
               end
               # Returns the new status if the journal contains a status change, otherwise nil
               def new_status
                 c = details.detect {|detail| detail.prop_key == 'status_id'}
                 (c && c.value) ? IssueStatus.find_by_id(c.value.to_i) : nil
               end
               def new_value_for(prop)
                 c = details.detect {|detail| detail.prop_key == prop}
                 c ? c.value : nil
               end
               def editable_by?(usr)
                 usr && usr.logged? && (usr.allowed_to?(:edit_issue_notes, project) || (self.user == usr && usr.allowed_to?(:edit_own_issue_notes, project)))
               end
               def project
                 journalized.respond_to?(:project) ? journalized.project : nil
               end
               def attachments
                 journalized.respond_to?(:attachments) ? journalized.attachments : nil
               end
             end

app/views/search/index.rhtml +7 -3

             <h2><%= l(:label_search) %></h2>
             <div class="box">
             <% form_tag({}, :method => :get) do %>
             <p><%= text_field_tag 'q', @question, :size => 60, :id => 'search-input' %>
             <%= javascript_tag "Field.focus('search-input')" %>
             <%= project_select_tag %>
             <label><%= check_box_tag 'all_words', 1, @all_words %> <%= l(:label_all_words) %></label>
             <label><%= check_box_tag 'titles_only', 1, @titles_only %> <%= l(:label_search_titles_only) %></label>
             </p>
             <p>
             <% @object_types.each do |t| %>
-            <label><%= check_box_tag t, 1, @scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label>
+            <label><%= check_box_tag t, 1, @scope.include?(t) %> <%= type_label(t) %></label>
             <% end %>
             </p>
             <p><%= submit_tag l(:button_submit), :name => 'submit' %></p>
             <% end %>
             </div>
             <% if @results %>
-                <h3><%= l(:label_result_plural) %></h3>
+                <div id="search-results-counts">
+                <%= render_results_by_type(@results_by_type) unless @scope.size == 1 %>
+                </div>
+                <h3><%= l(:label_result_plural) %> (<%= @results_by_type.values.sum %>)</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(truncate(e.event_title, 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>
+                    <span class="author"><%= format_time(e.event_datetime) %></span></dd>
                   <% end %>
                 </dl>
             <% end %>
             <p><center>
             <% if @pagination_previous_date %>
             <%= link_to_remote ('&#171; ' + l(:label_previous)),
                                {:update => :content,
                                 :url => params.merge(:previous => 1, :offset => @pagination_previous_date.strftime("%Y%m%d%H%M%S"))
                                }, :href => url_for(params.merge(:previous => 1, :offset => @pagination_previous_date.strftime("%Y%m%d%H%M%S"))) %>&nbsp;
             <% end %>
             <% if @pagination_next_date %>
             <%= link_to_remote (l(:label_next) + ' &#187;'),
                                {:update => :content,
                                 :url => params.merge(:previous => nil, :offset => @pagination_next_date.strftime("%Y%m%d%H%M%S"))
                                }, :href => url_for(params.merge(:previous => nil, :offset => @pagination_next_date.strftime("%Y%m%d%H%M%S"))) %>
             <% end %>
             </center></p>
             <% html_title(l(:label_search)) -%>

public/stylesheets/application.css +5 -1

             body { font-family: Verdana, sans-serif; font-size: 12px; color:#484848; margin: 0; padding: 0; min-width: 900px; }
             h1, h2, h3, h4 { font-family: "Trebuchet MS", Verdana, sans-serif;}
             h1 {margin:0; padding:0; font-size: 24px;}
             h2, .wiki h1 {font-size: 20px;padding: 2px 10px 1px 0px;margin: 0 0 10px 0; border-bottom: 1px solid #bbbbbb; color: #444;}
             h3, .wiki h2 {font-size: 16px;padding: 2px 10px 1px 0px;margin: 0 0 10px 0; border-bottom: 1px solid #bbbbbb; color: #444;}
             h4, .wiki h3 {font-size: 13px;padding: 2px 10px 1px 0px;margin-bottom: 5px; border-bottom: 1px dotted #bbbbbb; color: #444;}
             /***** Layout *****/
             #wrapper {background: white;}
             #top-menu {background: #2C4056; color: #fff; height:1.8em; font-size: 0.8em; padding: 2px 2px 0px 6px;}
             #top-menu ul {margin: 0;  padding: 0;}
             #top-menu li {
               float:left;
               list-style-type:none;
               margin: 0px 0px 0px 0px;
               padding: 0px 0px 0px 0px;
               white-space:nowrap;
             }
             #top-menu a {color: #fff; padding-right: 8px; font-weight: bold;}
             #top-menu #loggedas { float: right; margin-right: 0.5em; color: #fff; }
             #account {float:right;}
             #header {height:5.3em;margin:0;background-color:#507AAA;color:#f8f8f8; padding: 4px 8px 0px 6px; position:relative;}
             #header a {color:#f8f8f8;}
             #quick-search {float:right;}
             #main-menu {position: absolute;  bottom: 0px;  left:6px; margin-right: -500px;}
             #main-menu ul {margin: 0;  padding: 0;}
             #main-menu li {
               float:left;
               list-style-type:none;
               margin: 0px 2px 0px 0px;
               padding: 0px 0px 0px 0px;
               white-space:nowrap;
             }
             #main-menu li a {
               display: block;
               color: #fff;
               text-decoration: none;
               font-weight: bold;
               margin: 0;
               padding: 4px 10px 4px 10px;
             }
             #main-menu li a:hover {background:#759FCF; color:#fff;}
             #main-menu li a.selected, #main-menu li a.selected:hover {background:#fff; color:#555;}
             #main {background-color:#EEEEEE;}
             #sidebar{ float: right; width: 17%; position: relative; z-index: 9; min-height: 600px; padding: 0; margin: 0;}
             * html #sidebar{ width: 17%; }
             #sidebar h3{ font-size: 14px; margin-top:14px; color: #666;  }
             #sidebar hr{ width: 100%; margin: 0 auto; height: 1px; background: #ccc; border: 0; }
             * html #sidebar hr{ width: 95%; position: relative; left: -6px; color: #ccc; }
             #content { width: 80%; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; height:600px; min-height: 600px;}
             * html #content{ width: 80%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;}
             html>body #content { height: auto; min-height: 600px; overflow: auto; }
             #main.nosidebar #sidebar{ display: none; }
             #main.nosidebar #content{ width: auto; border-right: 0; }
             #footer {clear: both; border-top: 1px solid #bbb; font-size: 0.9em; color: #aaa; padding: 5px; text-align:center; background:#fff;}
             #login-form table {margin-top:5em; padding:1em; margin-left: auto; margin-right: auto; border: 2px solid #FDBF3B; background-color:#FFEBC1; }
             #login-form table td {padding: 6px;}
             #login-form label {font-weight: bold;}
             .clear:after{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
             /***** Links *****/
             a, a:link, a:visited{ color: #2A5685; text-decoration: none; }
             a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
             a img{ border: 0; }
             a.issue.closed { text-decoration: line-through; }
             /***** Tables *****/
             table.list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; margin-bottom: 4px; }
             table.list th {  background-color:#EEEEEE; padding: 4px; white-space:nowrap; }
             table.list td { vertical-align: top; }
             table.list td.id { width: 2%; text-align: center;}
             table.list td.checkbox { width: 15px; padding: 0px;}
             table.list.issues { margin-top: 10px; }
             tr.issue { text-align: center; white-space: nowrap; }
             tr.issue td.subject, tr.issue td.category { white-space: normal; }
             tr.issue td.subject { text-align: left; }
             tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;}
             tr.entry { border: 1px solid #f8f8f8; }
             tr.entry td { white-space: nowrap; }
             tr.entry td.filename { width: 30%; }
             tr.entry td.size { text-align: right; font-size: 90%; }
             tr.entry td.revision, tr.entry td.author { text-align: center; }
             tr.entry td.age { text-align: right; }
             tr.entry span.expander {background-image: url(../images/bullet_toggle_plus.png); padding-left: 8px; margin-left: 0; cursor: pointer;}
             tr.entry.open span.expander {background-image: url(../images/bullet_toggle_minus.png);}
             tr.entry.file td.filename a { margin-left: 16px; }
             tr.changeset td.author { text-align: center; width: 15%; }
             tr.changeset td.committed_on { text-align: center; width: 15%; }
             tr.message { height: 2.6em; }
             tr.message td.last_message { font-size: 80%; }
             tr.message.locked td.subject a { background-image: url(../images/locked.png); }
             tr.message.sticky td.subject a { background-image: url(../images/sticky.png); font-weight: bold; }
             tr.user td { width:13%; }
             tr.user td.email { width:18%; }
             tr.user td { white-space: nowrap; }
             tr.user.locked, tr.user.registered { color: #aaa; }
             tr.user.locked a, tr.user.registered a { color: #aaa; }
             tr.time-entry { text-align: center; white-space: nowrap; }
             tr.time-entry td.subject, tr.time-entry td.comments { text-align: left; white-space: normal; }
             td.hours { text-align: right; font-weight: bold; padding-right: 0.5em; }
             td.hours .hours-dec { font-size: 0.9em; }
             table.list tbody tr:hover { background-color:#ffffdd; }
             table td {padding:2px;}
             table p {margin:0;}
             .odd {background-color:#f6f7f8;}
             .even {background-color: #fff;}
             .highlight { background-color: #FCFD8D;}
             .highlight.token-1 { background-color: #faa;}
             .highlight.token-2 { background-color: #afa;}
             .highlight.token-3 { background-color: #aaf;}
             .box{
             padding:6px;
             margin-bottom: 10px;
             background-color:#f6f6f6;
             color:#505050;
             line-height:1.5em;
             border: 1px solid #e4e4e4;
             }
             div.square {
              border: 1px solid #999;
              float: left;
              margin: .3em .4em 0 .4em;
              overflow: hidden;
              width: .6em; height: .6em;
             }
             .contextual {float:right; white-space: nowrap; line-height:1.4em;margin-top:5px; padding-left: 10px; font-size:0.9em;}
             .contextual input {font-size:0.9em;}
             .splitcontentleft{float:left; width:49%;}
             .splitcontentright{float:right; width:49%;}
             form {display: inline;}
             input, select {vertical-align: middle; margin-top: 1px; margin-bottom: 1px;}
             fieldset {border: 1px solid #e4e4e4; margin:0;}
             legend {color: #484848;}
             hr { width: 100%; height: 1px; background: #ccc; border: 0;}
             blockquote { font-style: italic; border-left: 3px solid #e0e0e0; padding-left: 0.6em; margin-left: 2.4em;}
             blockquote blockquote { margin-left: 0;}
             textarea.wiki-edit { width: 99%; }
             li p {margin-top: 0;}
             div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
             p.breadcrumb { font-size: 0.9em; margin: 4px 0 4px 0;}
             p.subtitle { font-size: 0.9em; margin: -6px 0 12px 0; font-style: italic; }
             fieldset#filters { padding: 0.7em; }
             fieldset#filters p { margin: 1.2em 0 0.8em 2px; }
             fieldset#filters .buttons { font-size: 0.9em; }
             fieldset#filters table { border-collapse: collapse; }
             fieldset#filters table td { padding: 0; vertical-align: middle; }
             fieldset#filters tr.filter { height: 2em; }
             fieldset#filters td.add-filter { text-align: right; vertical-align: top; }
             div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;}
             div#issue-changesets .changeset { padding: 4px;}
             div#issue-changesets .changeset { border-bottom: 1px solid #ddd; }
             div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}
             div#activity dl, #search-results { margin-left: 2em; }
             div#activity dd, #search-results dd { margin-bottom: 1em; padding-left: 18px; font-size: 0.9em; }
             div#activity dt, #search-results dt { margin-bottom: 0px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
             div#activity dt.me .time { border-bottom: 1px solid #999; }
             div#activity dt .time { color: #777; font-size: 80%; }
             div#activity dd .description, #search-results dd .description { font-style: italic; }
             div#activity span.project:after, #search-results span.project:after { content: " -"; }
-            #search-results dd { margin-bottom: 1em; padding-left: 20px; margin-left:0px;}
             div#activity dd span.description, #search-results dd span.description { display:block; }
+            #search-results dd { margin-bottom: 1em; padding-left: 20px; margin-left:0px; }
+            div#search-results-counts {float:right;}
+            div#search-results-counts ul { margin-top: 0.5em; }
+            div#search-results-counts  li { list-style-type:none; float: left; margin-left: 1em; }
             dt.issue { background-image: url(../images/ticket.png); }
             dt.issue-edit { background-image: url(../images/ticket_edit.png); }
             dt.issue-closed { background-image: url(../images/ticket_checked.png); }
             dt.issue-note { background-image: url(../images/ticket_note.png); }
             dt.changeset { background-image: url(../images/changeset.png); }
             dt.news { background-image: url(../images/news.png); }
             dt.message { background-image: url(../images/message.png); }
             dt.reply { background-image: url(../images/comments.png); }
             dt.wiki-page { background-image: url(../images/wiki_edit.png); }
             dt.attachment { background-image: url(../images/attachment.png); }
             dt.document { background-image: url(../images/document.png); }
             dt.project { background-image: url(../images/projects.png); }
             div#roadmap fieldset.related-issues { margin-bottom: 1em; }
             div#roadmap fieldset.related-issues ul { margin-top: 0.3em; margin-bottom: 0.3em; }
             div#roadmap .wiki h1:first-child { display: none; }
             div#roadmap .wiki h1 { font-size: 120%; }
             div#roadmap .wiki h2 { font-size: 110%; }
             div#version-summary { float:right; width:380px; margin-left: 16px; margin-bottom: 16px; background-color: #fff; }
             div#version-summary fieldset { margin-bottom: 1em; }
             div#version-summary .total-hours { text-align: right; }
             table#time-report td.hours, table#time-report th.period, table#time-report th.total { text-align: right; padding-right: 0.5em; }
             table#time-report tbody tr { font-style: italic; color: #777; }
             table#time-report tbody tr.last-level { font-style: normal; color: #555; }
             table#time-report tbody tr.total { font-style: normal; font-weight: bold; color: #555; background-color:#EEEEEE; }
             table#time-report .hours-dec { font-size: 0.9em; }
             ul.properties {padding:0; font-size: 0.9em; color: #777;}
             ul.properties li {list-style-type:none;}
             ul.properties li span {font-style:italic;}
             .total-hours { font-size: 110%; font-weight: bold; }
             .total-hours span.hours-int { font-size: 120%; }
             .autoscroll {overflow-x: auto; padding:1px; margin-bottom: 1.2em;}
             #user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }
             .pagination {font-size: 90%}
             p.pagination {margin-top:8px;}
             /***** Tabular forms ******/
             .tabular p{
             margin: 0;
             padding: 5px 0 8px 0;
             padding-left: 180px; /*width of left column containing the label elements*/
             height: 1%;
             clear:left;
             }
             html>body .tabular p {overflow:hidden;}
             .tabular label{
             font-weight: bold;
             float: left;
             text-align: right;
             margin-left: -180px; /*width of left column*/
             width: 175px; /*width of labels. Should be smaller than left column to create some right
             margin*/
             }
             .tabular label.floating{
             font-weight: normal;
             margin-left: 0px;
             text-align: left;
             width: 200px;
             }
             input#time_entry_comments { width: 90%;}
             #preview fieldset {margin-top: 1em; background: url(../images/draft.png)}
             .tabular.settings p{ padding-left: 300px; }
             .tabular.settings label{ margin-left: -300px; width: 295px; }
             .required {color: #bb0000;}
             .summary {font-style: italic;}
             #attachments_fields input[type=text] {margin-left: 8px; }
             div.attachments p { margin:4px 0 2px 0; }
             div.attachments img { vertical-align: middle; }
             div.attachments span.author { font-size: 0.9em; color: #888; }
             p.other-formats { text-align: right; font-size:0.9em; color: #666; }
             .other-formats span + span:before { content: "| "; }
             a.feed { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; }
             /***** Flash & error messages ****/
             #errorExplanation, div.flash, .nodata, .warning {
                 padding: 4px 4px 4px 30px;
                 margin-bottom: 12px;
             	font-size: 1.1em;
             	border: 2px solid;
             }
             div.flash {margin-top: 8px;}
             div.flash.error, #errorExplanation {
                 background: url(../images/false.png) 8px 5px no-repeat;
             	background-color: #ffe3e3;
             	border-color: #dd0000;
             	color: #550000;
             }
             div.flash.notice {
                 background: url(../images/true.png) 8px 5px no-repeat;
             	background-color: #dfffdf;
             	border-color: #9fcf9f;
             	color: #005f00;
             }
             .nodata, .warning {
                 text-align: center;
             	background-color: #FFEBC1;
             	border-color: #FDBF3B;
             	color: #A6750C;
             }
             #errorExplanation ul { font-size: 0.9em;}
             /***** Ajax indicator ******/
             #ajax-indicator {
             position: absolute; /* fixed not supported by IE */
             background-color:#eee;
             border: 1px solid #bbb;
             top:35%;
             left:40%;
             width:20%;
             font-weight:bold;
             text-align:center;
             padding:0.6em;
             z-index:100;
             filter:alpha(opacity=50);
             opacity: 0.5;
             }
             html>body #ajax-indicator { position: fixed; }
             #ajax-indicator span {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             background-image: url(../images/loading.gif);
             padding-left: 26px;
             vertical-align: bottom;
             }
             /***** Calendar *****/
             table.cal {border-collapse: collapse; width: 100%; margin: 8px 0 6px 0;border: 1px solid #d7d7d7;}
             table.cal thead th {width: 14%;}
             table.cal tbody tr {height: 100px;}
             table.cal th { background-color:#EEEEEE; padding: 4px; }
             table.cal td {border: 1px solid #d7d7d7; vertical-align: top; font-size: 0.9em;}
             table.cal td p.day-num {font-size: 1.1em; text-align:right;}
             table.cal td.odd p.day-num {color: #bbb;}
             table.cal td.today {background:#ffffdd;}
             table.cal td.today p.day-num {font-weight: bold;}
             /***** Tooltips ******/
             .tooltip{position:relative;z-index:24;}
             .tooltip:hover{z-index:25;color:#000;}
             .tooltip span.tip{display: none; text-align:left;}
             div.tooltip:hover span.tip{
             display:block;
             position:absolute;
             top:12px; left:24px; width:270px;
             border:1px solid #555;
             background-color:#fff;
             padding: 4px;
             font-size: 0.8em;
             color:#505050;
             }
             /***** Progress bar *****/
             table.progress {
                 border: 1px solid #D7D7D7;
                 border-collapse: collapse;
                 border-spacing: 0pt;
                 empty-cells: show;
                 text-align: center;
                 float:left;
                 margin: 1px 6px 1px 0px;
             }
             table.progress td { height: 0.9em; }
             table.progress td.closed { background: #BAE0BA none repeat scroll 0%; }
             table.progress td.done { background: #DEF0DE none repeat scroll 0%; }
             table.progress td.open { background: #FFF none repeat scroll 0%; }
             p.pourcent {font-size: 80%;}
             p.progress-info {clear: left; font-style: italic; font-size: 80%;}
             /***** Tabs *****/
             #content .tabs {height: 2.6em; border-bottom: 1px solid #bbbbbb; margin-bottom:1.2em; position:relative;}
             #content .tabs ul {margin:0; position:absolute; bottom:-2px; padding-left:1em;}
             #content .tabs>ul { bottom:-1px; } /* others */
             #content .tabs ul li {
             float:left;
             list-style-type:none;
             white-space:nowrap;
             margin-right:8px;
             background:#fff;
             }
             #content .tabs ul li a{
             display:block;
             font-size: 0.9em;
             text-decoration:none;
             line-height:1.3em;
             padding:4px 6px 4px 6px;
             border: 1px solid #ccc;
             border-bottom: 1px solid #bbbbbb;
             background-color: #eeeeee;
             color:#777;
             font-weight:bold;
             }
             #content .tabs ul li a:hover {
             background-color: #ffffdd;
             text-decoration:none;
             }
             #content .tabs ul li a.selected {
             background-color: #fff;
             border: 1px solid #bbbbbb;
             border-bottom: 1px solid #fff;
             }
             #content .tabs ul li a.selected:hover {
             background-color: #fff;
             }
             /***** Diff *****/
             .diff_out { background: #fcc; }
             .diff_in { background: #cfc; }
             /***** Wiki *****/
             div.wiki table {
                 border: 1px solid #505050;
                 border-collapse: collapse;
                 margin-bottom: 1em;
             }
             div.wiki table, div.wiki td, div.wiki th {
                 border: 1px solid #bbb;
                 padding: 4px;
             }
             div.wiki .external {
                 background-position: 0% 60%;
                 background-repeat: no-repeat;
                 padding-left: 12px;
                 background-image: url(../images/external.png);
             }
             div.wiki a.new {
                 color: #b73535;
             }
             div.wiki pre {
                 margin: 1em 1em 1em 1.6em;
                 padding: 2px;
                 background-color: #fafafa;
                 border: 1px solid #dadada;
                 width:95%;
                 overflow-x: auto;
             }
             div.wiki div.toc {
                 background-color: #ffffdd;
                 border: 1px solid #e4e4e4;
                 padding: 4px;
                 line-height: 1.2em;
                 margin-bottom: 12px;
                 margin-right: 12px;
                 display: table
             }
             * html div.wiki div.toc { width: 50%; } /* IE6 doesn't autosize div */
             div.wiki div.toc.right { float: right; margin-left: 12px; margin-right: 0; width: auto; }
             div.wiki div.toc.left  { float: left; margin-right: 12px; margin-left: 0; width: auto; }
             div.wiki div.toc a {
                 display: block;
                 font-size: 0.9em;
                 font-weight: normal;
                 text-decoration: none;
                 color: #606060;
             }
             div.wiki div.toc a:hover { color: #c61a1a; text-decoration: underline;}
             div.wiki div.toc a.heading2 { margin-left: 6px; }
             div.wiki div.toc a.heading3 { margin-left: 12px; font-size: 0.8em; }
             /***** My page layout *****/
             .block-receiver {
             border:1px dashed #c0c0c0;
             margin-bottom: 20px;
             padding: 15px 0 15px 0;
             }
             .mypage-box {
             margin:0 0 20px 0;
             color:#505050;
             line-height:1.5em;
             }
             .handle {
             cursor: move;
             }
             a.close-icon {
             display:block;
             margin-top:3px;
             overflow:hidden;
             width:12px;
             height:12px;
             background-repeat: no-repeat;
             cursor:pointer;
             background-image:url('../images/close.png');
             }
             a.close-icon:hover {
             background-image:url('../images/close_hl.png');
             }
             /***** Gantt chart *****/
             .gantt_hdr {
               position:absolute;
               top:0;
               height:16px;
               border-top: 1px solid #c0c0c0;
               border-bottom: 1px solid #c0c0c0;
               border-right: 1px solid #c0c0c0;
               text-align: center;
               overflow: hidden;
             }
             .task {
               position: absolute;
               height:8px;
               font-size:0.8em;
               color:#888;
               padding:0;
               margin:0;
               line-height:0.8em;
             }
             .task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }
             .task_done { background:#66f url(../images/task_done.png); border: 1px solid #66f; }
             .task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; }
             .milestone { background-image:url(../images/milestone.png); background-repeat: no-repeat; border: 0; }
             /***** Icons *****/
             .icon {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             padding-left: 20px;
             padding-top: 2px;
             padding-bottom: 3px;
             }
             .icon22 {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             padding-left: 26px;
             line-height: 22px;
             vertical-align: middle;
             }
             .icon-add { background-image: url(../images/add.png); }
             .icon-edit { background-image: url(../images/edit.png); }
             .icon-copy { background-image: url(../images/copy.png); }
             .icon-del { background-image: url(../images/delete.png); }
             .icon-move { background-image: url(../images/move.png); }
             .icon-save { background-image: url(../images/save.png); }
             .icon-cancel { background-image: url(../images/cancel.png); }
             .icon-file { background-image: url(../images/file.png); }
             .icon-folder { background-image: url(../images/folder.png); }
             .open .icon-folder { background-image: url(../images/folder_open.png); }
             .icon-package { background-image: url(../images/package.png); }
             .icon-home { background-image: url(../images/home.png); }
             .icon-user { background-image: url(../images/user.png); }
             .icon-mypage { background-image: url(../images/user_page.png); }
             .icon-admin { background-image: url(../images/admin.png); }
             .icon-projects { background-image: url(../images/projects.png); }
             .icon-logout { background-image: url(../images/logout.png); }
             .icon-help { background-image: url(../images/help.png); }
             .icon-attachment  { background-image: url(../images/attachment.png); }
             .icon-index  { background-image: url(../images/index.png); }
             .icon-history  { background-image: url(../images/history.png); }
             .icon-time  { background-image: url(../images/time.png); }
             .icon-stats  { background-image: url(../images/stats.png); }
             .icon-warning  { background-image: url(../images/warning.png); }
             .icon-fav  { background-image: url(../images/fav.png); }
             .icon-fav-off  { background-image: url(../images/fav_off.png); }
             .icon-reload  { background-image: url(../images/reload.png); }
             .icon-lock  { background-image: url(../images/locked.png); }
             .icon-unlock  { background-image: url(../images/unlock.png); }
             .icon-checked  { background-image: url(../images/true.png); }
             .icon-details  { background-image: url(../images/zoom_in.png); }
             .icon-report  { background-image: url(../images/report.png); }
             .icon22-projects { background-image: url(../images/22x22/projects.png); }
             .icon22-users { background-image: url(../images/22x22/users.png); }
             .icon22-tracker { background-image: url(../images/22x22/tracker.png); }
             .icon22-role { background-image: url(../images/22x22/role.png); }
             .icon22-workflow { background-image: url(../images/22x22/workflow.png); }
             .icon22-options { background-image: url(../images/22x22/options.png); }
             .icon22-notifications { background-image: url(../images/22x22/notifications.png); }
             .icon22-authent { background-image: url(../images/22x22/authent.png); }
             .icon22-info { background-image: url(../images/22x22/info.png); }
             .icon22-comment { background-image: url(../images/22x22/comment.png); }
             .icon22-package { background-image: url(../images/22x22/package.png); }
             .icon22-settings { background-image: url(../images/22x22/settings.png); }
             .icon22-plugin { background-image: url(../images/22x22/plugin.png); }
             /***** Media print specific styles *****/
             @media print {
               #top-menu, #header, #main-menu, #sidebar, #footer, .contextual, .other-formats { display:none; }
               #main { background: #fff; }
               #content { width: 99%; margin: 0; padding: 0; border: 0; background: #fff; }
             }

test/functional/search_controller_test.rb +8 0

             require File.dirname(__FILE__) + '/../test_helper'
             require 'search_controller'
             # Re-raise errors caught by the controller.
             class SearchController; def rescue_action(e) raise e end; end
             class SearchControllerTest < Test::Unit::TestCase
               fixtures :projects, :enabled_modules, :roles, :users,
                        :issues, :trackers, :issue_statuses,
                        :custom_fields, :custom_values,
                        :repositories, :changesets
               def setup
                 @controller = SearchController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 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_all_projects
                 get :index, :q => 'recipe subproject commit', :submit => 'Search'
                 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_tag :dt, :attributes => { :class => /issue/ },
+                                :child => { :tag => 'a',  :content => /Add ingredients categories/ },
+                                :sibling => { :tag => 'dd', :content => /should be classified by categories/ }
+                assert assigns(:results_by_type).is_a?(Hash)
+                assert_equal 4, assigns(:results_by_type)['changesets']
+                assert_tag :a, :content => 'Changesets (4)'
               end
               def test_search_project_and_subprojects
                 get :index, :id => 1, :q => 'recipe subproject', :scope => 'subprojects', :submit => 'Search'
                 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(3))
               end
               def test_search_all_words
                 # 'all words' is on by default
                 get :index, :id => 1, :q => 'recipe updating saving'
                 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', :submit => 'Search'
                 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', :all_words => '1', :titles_only => '1', :submit => 'Search'
                 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', :submit => 'Search'
                 results = assigns(:results)
                 assert_not_nil results
                 assert_equal 2, results.size
               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/show/3'
                 # issue of a private project
                 get :index, :q => "4"
                 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
             end

test/unit/search_test.rb +29 -20

             # redMine - project management software
             # Copyright (C) 2006-2008  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.dirname(__FILE__) + '/../test_helper'
             class SearchTest < Test::Unit::TestCase
               fixtures :users,
                        :members,
                        :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)
+                r = Issue.search(@issue_keyword).first
                 assert r.include?(@issue)
-                r = Changeset.search(@changeset_keyword)
+                r = Changeset.search(@changeset_keyword).first
                 assert r.include?(@changeset)
                 # Removes the :view_changesets permission from Anonymous role
                 remove_permission Role.anonymous, :view_changesets
-                r = Issue.search(@issue_keyword)
+                r = Issue.search(@issue_keyword).first
                 assert r.include?(@issue)
-                r = Changeset.search(@changeset_keyword)
+                r = Changeset.search(@changeset_keyword).first
                 assert !r.include?(@changeset)
                 # Make the project private
                 @project.update_attribute :is_public, false
-                r = Issue.search(@issue_keyword)
+                r = Issue.search(@issue_keyword).first
                 assert !r.include?(@issue)
-                r = Changeset.search(@changeset_keyword)
+                r = Changeset.search(@changeset_keyword).first
                 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)
+                r = Issue.search(@issue_keyword).first
                 assert r.include?(@issue)
-                r = Changeset.search(@changeset_keyword)
+                r = Changeset.search(@changeset_keyword).first
                 assert r.include?(@changeset)
                 # Removes the :view_changesets permission from Non member role
                 remove_permission Role.non_member, :view_changesets
-                r = Issue.search(@issue_keyword)
+                r = Issue.search(@issue_keyword).first
                 assert r.include?(@issue)
-                r = Changeset.search(@changeset_keyword)
+                r = Changeset.search(@changeset_keyword).first
                 assert !r.include?(@changeset)
                 # Make the project private
                 @project.update_attribute :is_public, false
-                r = Issue.search(@issue_keyword)
+                r = Issue.search(@issue_keyword).first
                 assert !r.include?(@issue)
-                r = Changeset.search(@changeset_keyword)
+                r = Changeset.search(@changeset_keyword).first
                 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)
+                r = Issue.search(@issue_keyword).first
                 assert r.include?(@issue)
-                r = Changeset.search(@changeset_keyword)
+                r = Changeset.search(@changeset_keyword).first
                 assert r.include?(@changeset)
                 # Make the project private
                 @project.update_attribute :is_public, false
-                r = Issue.search(@issue_keyword)
+                r = Issue.search(@issue_keyword).first
                 assert r.include?(@issue)
-                r = Changeset.search(@changeset_keyword)
+                r = Changeset.search(@changeset_keyword).first
                 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)
+                r = Issue.search(@issue_keyword).first
                 assert r.include?(@issue)
-                r = Changeset.search(@changeset_keyword)
+                r = Changeset.search(@changeset_keyword).first
                 assert !r.include?(@changeset)
                 # Make the project private
                 @project.update_attribute :is_public, false
-                r = Issue.search(@issue_keyword)
+                r = Issue.search(@issue_keyword).first
                 assert r.include?(@issue)
-                r = Changeset.search(@changeset_keyword)
+                r = Changeset.search(@changeset_keyword).first
                 assert !r.include?(@changeset)
               end
+              def test_search_issue_with_multiple_hits_in_journals
+                i = Issue.find(1)
+                assert_equal 2, i.journals.count(:all, :conditions => "notes LIKE '%notes%'")
+                r = Issue.search('%notes%').first
+                assert_equal 1, r.size
+                assert_equal i, r.first
+              end
               private
               def remove_permission(role, permission)
                 role.permissions = role.permissions - [ permission ]
                 role.save
               end
             end

vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb +26 -14

             # redMine - project management software
             # Copyright (C) 2006-2007  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
+                    # 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)
+                    # * :sort_order - name of the column used to sort results (default to :date_column or created_on)
+                    # * :permission - permission required to search the model (default to :view_"objects")
                     def acts_as_searchable(options = {})
                       return if self.included_modules.include?(Redmine::Acts::Searchable::InstanceMethods)
                       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
                       if searchable_options[:project_key]
                       elsif column_names.include?('project_id')
                         searchable_options[:project_key] = "#{table_name}.project_id"
                       else
                         raise 'No project key defined.'
                       end
                       if searchable_options[:date_column]
                       elsif column_names.include?('created_on')
                         searchable_options[:date_column] = "#{table_name}.created_on"
                       else
                         raise 'No date column defined defined.'
                       end
+                      searchable_options[:order_column] ||= searchable_options[:date_column]
                       # Permission needed to search this model
                       searchable_options[:permission] = "view_#{self.name.underscore.pluralize}".to_sym unless searchable_options.has_key?(:permission)
                       # 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
-                      # Search the model for the given tokens
+                      # Searches the model for the given tokens
                       # projects argument can be either nil (will search all projects), a project or an array of projects
+                      # Returns the results and the results count
                       def search(tokens, projects=nil, options={})
                         tokens = [] << tokens unless tokens.is_a?(Array)
                         projects = [] << projects unless projects.nil? || projects.is_a?(Array)
                         find_options = {:include => searchable_options[:include]}
-                        find_options[:limit] = options[:limit] if options[:limit]
+                        find_options[:order] = "#{searchable_options[:order_column]} " + (options[:before] ? 'DESC' : 'ASC')
-                        find_options[:order] = "#{searchable_options[:date_column]} " + (options[:before] ? 'DESC' : 'ASC')
+                        limit_options = {}
+                        limit_options[:limit] = options[:limit] if options[:limit]
+                        if options[:offset]
+                          limit_options[:conditions] = "(#{searchable_options[:date_column]} " + (options[:before] ? '<' : '>') + "'#{connection.quoted_date(options[:offset])}')"
+                        end
                         columns = searchable_options[:columns]
                         columns.slice!(1..-1) if options[:titles_only]
                         token_clauses = columns.collect {|column| "(LOWER(#{column}) LIKE ?)"}
                         if !options[:titles_only] && searchable_options[:search_custom_fields]
                           searchable_custom_field_ids = CustomField.find(:all,
                                                                          :select => 'id',
                                                                          :conditions => { :type => "#{self.name}CustomField",
                                                                                           :searchable => true }).collect(&:id)
                           if searchable_custom_field_ids.any?
                             custom_field_sql = "#{table_name}.id IN (SELECT customized_id FROM #{CustomValue.table_name}" +
                               " WHERE customized_type='#{self.name}' AND customized_id=#{table_name}.id AND LOWER(value) LIKE ?" +
                               " AND #{CustomValue.table_name}.custom_field_id IN (#{searchable_custom_field_ids.join(',')}))"
                             token_clauses << custom_field_sql
                           end
                         end
                         sql = (['(' + token_clauses.join(' OR ') + ')'] * tokens.size).join(options[:all_words] ? ' AND ' : ' OR ')
-                        if options[:offset]
-                          sql = "(#{sql}) AND (#{searchable_options[:date_column]} " + (options[:before] ? '<' : '>') + "'#{connection.quoted_date(options[:offset])}')"
-                        end
                         find_options[:conditions] = [sql, * (tokens * token_clauses.size).sort]
                         project_conditions = []
                         project_conditions << (searchable_options[:permission].nil? ? Project.visible_by(User.current) :
                                                              Project.allowed_to_condition(User.current, searchable_options[:permission]))
                         project_conditions << "#{searchable_options[:project_key]} IN (#{projects.collect(&:id).join(',')})" unless projects.nil?
-                        results = with_scope(:find => {:conditions => project_conditions.join(' AND ')}) do
+                        results = []
-                          find(:all, find_options)
+                        results_count = 0
-                        end
-                        if searchable_options[:with] && !options[:titles_only]
+                        with_scope(:find => {:conditions => project_conditions.join(' AND ')}) do
-                          searchable_options[:with].each do |model, assoc|
+                          with_scope(:find => find_options) do
-                            results += model.to_s.camelcase.constantize.search(tokens, projects, options).collect {|r| r.send assoc}
+                            results_count = count(:all)
+                            results = find(:all, limit_options)
                           end
-                          results.uniq!
                         end
-                        results
+                        [results, results_count]
                       end
                     end
                   end
                 end
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages