Mercurial > hg > soundsoftware-site
diff app/controllers/.svn/text-base/search_controller.rb.svn-base @ 511:107d36338b70 live
Merge from branch "cannam"
| author | Chris Cannam |
|---|---|
| date | Thu, 14 Jul 2011 10:43:07 +0100 |
| parents | 0c939c159af4 |
| children |
line wrap: on
line diff
--- a/app/controllers/.svn/text-base/search_controller.rb.svn-base Thu Jun 09 16:51:06 2011 +0100 +++ b/app/controllers/.svn/text-base/search_controller.rb.svn-base Thu Jul 14 10:43:07 2011 +0100 @@ -1,5 +1,5 @@ -# redMine - project management software -# Copyright (C) 2006 Jean-Philippe Lang +# Redmine - project management software +# 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 @@ -24,8 +24,8 @@ def index @question = params[:q] || "" @question.strip! - @all_words = params[:all_words] || (params[:submit] ? false : true) - @titles_only = !params[:titles_only].nil? + @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]