Index: app/controllers/search_controller.rb =================================================================== --- app/controllers/search_controller.rb (revision 13959) +++ app/controllers/search_controller.rb (working copy) @@ -66,7 +66,9 @@ @result_count_by_type = fetcher.result_count_by_type @tokens = fetcher.tokens - @result_pages = Paginator.new @result_count, 10, params['page'] + per_page = Setting.search_results_per_page.to_i + per_page = 10 if per_page == 0 + @result_pages = Paginator.new @result_count, per_page, params['page'] @results = fetcher.results(@result_pages.offset, @result_pages.per_page) else @question = "" Index: app/views/settings/_general.html.erb =================================================================== --- app/views/settings/_general.html.erb (revision 13959) +++ app/views/settings/_general.html.erb (working copy) @@ -11,6 +11,8 @@

<%= setting_text_field :per_page_options, :size => 20 %> <%= l(:text_comma_separated) %>

+

<%= setting_text_field :search_results_per_page, :size => 6 %> +

<%= setting_text_field :activity_days_default, :size => 6 %> <%= l(:label_day_plural) %>

<%= setting_text_field :host_name, :size => 60 %> Index: config/locales/en.yml =================================================================== --- config/locales/en.yml (revision 13959) +++ config/locales/en.yml (working copy) @@ -415,6 +415,7 @@ setting_force_default_language_for_loggedin: Force default language for logged-in users setting_link_copied_issue: Link issues on copy setting_max_additional_emails: Maximum number of additional email addresses + setting_search_results_per_page: Search results per page permission_add_project: Create project permission_add_subprojects: Create subprojects Index: config/settings.yml =================================================================== --- config/settings.yml (revision 13959) +++ config/settings.yml (working copy) @@ -59,6 +59,8 @@ default: 30 per_page_options: default: '25,50,100' +search_results_per_page: + default: 10 mail_from: default: redmine@example.net bcc_recipients: