jro_apps/redmine Commit - r6082:2a799e83675a

Merged r6201 from trunk....

Jean-Philippe Lang -

r6082:2a799e83675a

parent child

Context file:

r6082:2a799e83675a

Collapse all files

app/controllers/search_controller.rb +4 -4

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006  Jean-Philippe Lang
+            # Copyright (C) 2006-2011  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
               helper :messages
               include MessagesHelper
               def index
                 @question = params[:q] || ""
                 @question.strip!
-                @all_words = params[:all_words] || (params[:submit] ? false : true)
+                @all_words = params[:all_words] ? params[:all_words].present? : true
-                @titles_only = !params[:titles_only].nil?
+                @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) : 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.visible.find_by_id($1.to_i)
                   redirect_to :controller => "issues", :action => "show", :id => $1
                   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,
                       :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 +3 -3

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006-2007  Jean-Philippe Lang
+            # Copyright (C) 2006-2011  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?
                 re_tokens = tokens.collect {|t| Regexp.escape(t)}
                 regexp = Regexp.new "(#{re_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
                   words = words.mb_chars
                   if i.even?
                     result << h(words.length > 100 ? "#{words.slice(0..44)} ... #{words.slice(-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", :default => t.to_s.humanize)
               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.descendants.active.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)
+                  links << link_to(text, :q => params[:q], :titles_only => params[:titles_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/views/search/index.rhtml +2 0

             <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 %>
+            <%= 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>
             <% @object_types.each do |t| %>
             <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 %>
                 <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, :length => 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><center>
             <% if @pagination_previous_date %>
             <%= link_to_content_update('&#171; ' + 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) + ' &#187;',
                   params.merge(:previous => nil, :offset => @pagination_next_date.strftime("%Y%m%d%H%M%S"))) %>
             <% end %>
             </center></p>
             <% html_title(l(:label_search)) -%>

test/functional/search_controller_test.rb +21 -6

             require File.expand_path('../../test_helper', __FILE__)
             require 'search_controller'
             # Re-raise errors caught by the controller.
             class SearchController; def rescue_action(e) raise e end; end
             class SearchControllerTest < ActionController::TestCase
               fixtures :projects, :enabled_modules, :roles, :users, :members, :member_roles,
                        :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'
+                get :index, :q => 'recipe subproject commit', :all_words => ''
                 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 5, assigns(:results_by_type)['changesets']
                 assert_tag :a, :content => '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_tag :dt, :attributes => { :class => /issue closed/ },
                                 :child => { :tag => 'a',  :content => /Closed/ }
               end
               def test_search_project_and_subprojects
-                get :index, :id => 1, :q => 'recipe subproject', :scope => 'subprojects', :submit => 'Search'
+                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'
+                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', :submit => 'Search'
+                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', :all_words => '1', :titles_only => '1', :submit => 'Search'
+                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', :submit => 'Search'
+                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.update_all("description = 'This is a searchkeywordinthecontent'", "id=1")
+                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_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
             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