diff app/controllers/search_controller.rb @ 909:cbb26bc654de redmine-1.3

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)

--- a/app/controllers/search_controller.rb	Fri Feb 24 18:36:29 2012 +0000
+++ b/app/controllers/search_controller.rb	Fri Feb 24 19:09:32 2012 +0000
@@ -5,12 +5,12 @@
 # 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.
@@ -26,7 +26,7 @@
     @question.strip!
     @all_words = params[:all_words] ? params[:all_words].present? : true
     @titles_only = params[:titles_only] ? params[:titles_only].present? : false
-    
+
     projects_to_search =
       case params[:scope]
       when 'all'
@@ -38,16 +38,16 @@
       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
@@ -55,23 +55,23 @@
       # 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  
-      
+      @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,
@@ -87,13 +87,13 @@
       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 
+          @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 
+          @pagination_previous_date = @results[-(limit)].event_datetime
           @results = @results[-(limit), limit]
         end
       end
@@ -103,7 +103,7 @@
     render :layout => false if request.xhr?
   end
 
-private  
+private
   def find_optional_project
     return true unless params[:id]
     @project = Project.find(params[:id])