comparison app/controllers/search_controller.rb @ 1295:622f24f53b42 redmine-2.3

Update to Redmine SVN revision 11972 on 2.3-stable branch
author Chris Cannam
date Fri, 14 Jun 2013 09:02:21 +0100
parents 433d4f72a19b
children 4f746d8966dd e248c7af89ec
comparison
equal deleted inserted replaced
1294:3e4c3460b6ca 1295:622f24f53b42
1 # Redmine - project management software 1 # Redmine - project management software
2 # Copyright (C) 2006-2012 Jean-Philippe Lang 2 # Copyright (C) 2006-2013 Jean-Philippe Lang
3 # 3 #
4 # This program is free software; you can redistribute it and/or 4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License 5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2 6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version. 7 # of the License, or (at your option) any later version.
15 # along with this program; if not, write to the Free Software 15 # along with this program; if not, write to the Free Software
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 class SearchController < ApplicationController 18 class SearchController < ApplicationController
19 before_filter :find_optional_project 19 before_filter :find_optional_project
20
21 helper :messages
22 include MessagesHelper
23 20
24 def index 21 def index
25 @question = params[:q] || "" 22 @question = params[:q] || ""
26 @question.strip! 23 @question.strip!
27 @all_words = params[:all_words] ? params[:all_words].present? : true 24 @all_words = params[:all_words] ? params[:all_words].present? : true
41 38
42 offset = nil 39 offset = nil
43 begin; offset = params[:offset].to_time if params[:offset]; rescue; end 40 begin; offset = params[:offset].to_time if params[:offset]; rescue; end
44 41
45 # quick jump to an issue 42 # quick jump to an issue
46 if @question.match(/^#?(\d+)$/) && Issue.visible.find_by_id($1.to_i) 43 if (m = @question.match(/^#?(\d+)$/)) && (issue = Issue.visible.find_by_id(m[1].to_i))
47 redirect_to :controller => "issues", :action => "show", :id => $1 44 redirect_to issue_path(issue)
48 return 45 return
49 end 46 end
50 47
51 @object_types = Redmine::Search.available_search_types.dup 48 @object_types = Redmine::Search.available_search_types.dup
52 if projects_to_search.is_a? Project 49 if projects_to_search.is_a? Project