Merged r15583 and r15584 (#23153).

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15618 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2016-07-10 07:53:37 +00:00
parent 0804245614
commit b03d3fa623
2 changed files with 2 additions and 1 deletions

View File

@@ -68,7 +68,7 @@ class SearchController < ApplicationController
fetcher = Redmine::Search::Fetcher.new(
@question, User.current, @scope, projects_to_search,
:all_words => @all_words, :titles_only => @titles_only, :attachments => @search_attachments, :open_issues => @open_issues,
:cache => params[:page].present?
:cache => params[:page].present?, :params => params
)
if fetcher.tokens.present?

View File

@@ -26,6 +26,7 @@
<label><%= radio_button_tag 'attachments', '1', @search_attachments == '1' %> <%= l(:label_search_attachments_yes) %></label>
<label><%= radio_button_tag 'attachments', 'only', @search_attachments == 'only' %> <%= l(:label_search_attachments_only) %></label>
</p>
<%= call_hook(:view_search_index_options_content_bottom) %>
</div>
</fieldset>
<%= hidden_field_tag 'options', '', :id => 'show-options' %>