@@ -66,7 +66,9 class SearchController < ApplicationController | |||
|
66 | 66 | @result_count_by_type = fetcher.result_count_by_type |
|
67 | 67 | @tokens = fetcher.tokens |
|
68 | 68 | |
|
69 | @result_pages = Paginator.new @result_count, 10, params['page'] | |
|
69 | per_page = Setting.search_results_per_page.to_i | |
|
70 | per_page = 10 if per_page == 0 | |
|
71 | @result_pages = Paginator.new @result_count, per_page, params['page'] | |
|
70 | 72 | @results = fetcher.results(@result_pages.offset, @result_pages.per_page) |
|
71 | 73 | else |
|
72 | 74 | @question = "" |
@@ -11,6 +11,8 | |||
|
11 | 11 | <p><%= setting_text_field :per_page_options, :size => 20 %> |
|
12 | 12 | <em class="info"><%= l(:text_comma_separated) %></em></p> |
|
13 | 13 | |
|
14 | <p><%= setting_text_field :search_results_per_page, :size => 6 %> | |
|
15 | ||
|
14 | 16 | <p><%= setting_text_field :activity_days_default, :size => 6 %> <%= l(:label_day_plural) %></p> |
|
15 | 17 | |
|
16 | 18 | <p><%= setting_text_field :host_name, :size => 60 %> |
@@ -415,6 +415,7 en: | |||
|
415 | 415 | setting_force_default_language_for_loggedin: Force default language for logged-in users |
|
416 | 416 | setting_link_copied_issue: Link issues on copy |
|
417 | 417 | setting_max_additional_emails: Maximum number of additional email addresses |
|
418 | setting_search_results_per_page: Search results per page | |
|
418 | 419 | |
|
419 | 420 | permission_add_project: Create project |
|
420 | 421 | permission_add_subprojects: Create subprojects |
@@ -435,6 +435,7 fr: | |||
|
435 | 435 | setting_force_default_language_for_loggedin: Forcer la langue par défault pour les utilisateurs identifiés |
|
436 | 436 | setting_link_copied_issue: Lier les demandes lors de la copie |
|
437 | 437 | setting_max_additional_emails: Nombre maximal d'adresses email additionnelles |
|
438 | setting_search_results_per_page: Résultats de recherche affichés par page | |
|
438 | 439 | |
|
439 | 440 | permission_add_project: Créer un projet |
|
440 | 441 | permission_add_subprojects: Créer des sous-projets |
General Comments 0
You need to be logged in to leave comments.
Login now