diff options
author | Max Kanat-Alexander <mkanat@bugzilla.org> | 2011-03-02 09:43:43 +0100 |
---|---|---|
committer | Max Kanat-Alexander <mkanat@bugzilla.org> | 2011-03-02 09:43:43 +0100 |
commit | b8566e4d8f5bc2df8b90c857a99c0f5c0beaebd8 (patch) | |
tree | 4b3198d06883cce87cbc07a1ab9eae489aee92c1 /template/en | |
parent | e81b9d51399792035e10c2cd6d1b32f75879c3ec (diff) | |
download | bugzilla-b8566e4d8f5bc2df8b90c857a99c0f5c0beaebd8.tar.gz bugzilla-b8566e4d8f5bc2df8b90c857a99c0f5c0beaebd8.tar.xz |
Bug 632718: Only return 500 search results unless the user specifically
requests to see more.
r=dkl, a=mkanat
Diffstat (limited to 'template/en')
-rw-r--r-- | template/en/default/admin/params/query.html.tmpl | 11 | ||||
-rw-r--r-- | template/en/default/list/list.html.tmpl | 36 |
2 files changed, 34 insertions, 13 deletions
diff --git a/template/en/default/admin/params/query.html.tmpl b/template/en/default/admin/params/query.html.tmpl index 0c0ff6224..d8f5f0c42 100644 --- a/template/en/default/admin/params/query.html.tmpl +++ b/template/en/default/admin/params/query.html.tmpl @@ -55,9 +55,18 @@ "Whether to allow a search on the 'Simple Search' page with an empty" _ " 'Words' field.", + default_search_limit => + "By default, $terms.Bugzilla limits searches done in the web" + _ " interface to returning only this many results, for performance" + _ " reasons. (This only affects the HTML format of search results--CSV," + _ " XML, and other formats are exempted.) Users can click a link on the" + _ " search result page to see all the results." + _ "<p>Usually you should not have to change this--the default value" + _ " should be acceptable for almost most installations.</p>", + max_search_results => "The maximum number of $terms.bugs that a search can" _ " <strong>ever</strong> return. Tabular and graphical reports" - _ " are exempted from this limit, however." + _ " are exempted from this limit, however.", } %] diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl index a669aecb9..15184d06b 100644 --- a/template/en/default/list/list.html.tmpl +++ b/template/en/default/list/list.html.tmpl @@ -110,9 +110,7 @@ [%############################################################################%] [% IF bugs.size > 9 %] - <span class="bz_result_count"> - [% bugs.size %] [%+ terms.bugs %] found. - </span> + [% PROCESS num_results %] [% END %] [%############################################################################%] @@ -134,15 +132,7 @@ [%# Succeeding Status Line #%] [%############################################################################%] -<span class="bz_result_count"> - [% IF bugs.size == 0 %] - <span class="zero_results">[% terms.zeroSearchResults %].</span> - [% ELSIF bugs.size == 1 %] - One [% terms.bug %] found. - [% ELSE %] - [% bugs.size %] [%+ terms.bugs %] found. - [% END %] -</span> +[% PROCESS num_results %] [% IF bugs.size == 0 %] <ul class="zero_result_links"> @@ -274,6 +264,10 @@ [% PROCESS global/footer.html.tmpl %] +[%##########%] +[%# Blocks #%] +[%##########%] + [% BLOCK edit_search_url %] [% editqueryname = searchname OR defaultsavename OR '' %] query.cgi?[% urlquerypart FILTER html %] @@ -291,3 +285,21 @@ in the "[% one_product.name FILTER html %]" product [% END %]</a> [% END %] + +[% BLOCK num_results %] + <span class="bz_result_count"> + [% IF bugs.size == 0 %] + <span class="zero_results">[% terms.zeroSearchResults %].</span> + [% ELSIF default_limited AND bugs.size >= Param('default_search_limit') %] + This result was limited to [% Param('default_search_limit') FILTER html %] + [%+ terms.bugs %]. + <a href="buglist.cgi?[% urlquerypart FILTER html %] + [%- "&order=$qorder" FILTER html IF order %]&limit=0">See + all search results for this query</a>. + [% ELSIF bugs.size == 1 %] + One [% terms.bug %] found. + [% ELSE %] + [% bugs.size %] [%+ terms.bugs %] found. + [% END %] + </span> +[% END %] |