diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2017-04-19 22:52:00 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2017-05-24 20:24:54 +0200 |
| commit | ffe838a923696f81e8d8e1f24c5dc7a568cbc6ac (patch) | |
| tree | 92894c1e927204b529759e8c3e9078720ce5e8bc /template/en | |
| parent | 50fc9d77128db4f8565265047166c6ef61bac5c5 (diff) | |
| download | bugzilla-ffe838a923696f81e8d8e1f24c5dc7a568cbc6ac.tar.gz bugzilla-ffe838a923696f81e8d8e1f24c5dc7a568cbc6ac.tar.xz | |
Bug 1348380 - Add param and user setting to control elasticsearch behavior
1) add an 'elasticsearch' param (configured via admin.cgi) that turns off all
code that would attempt to connect to elasticsearch.
2) add a user preference that controls using elasticsearch for searches, which defaults
to off for logged-in users. Anonymous users will default to using elasticsearch
for the greater good. Note that elasticsearch, if available, will still power
user-autocompletion (unless turned off as by the above parameter).
Diffstat (limited to 'template/en')
| -rw-r--r-- | template/en/default/admin/params/elastic.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/setting-descs.none.tmpl | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/template/en/default/admin/params/elastic.html.tmpl b/template/en/default/admin/params/elastic.html.tmpl index 47ec088b5..dc5459920 100644 --- a/template/en/default/admin/params/elastic.html.tmpl +++ b/template/en/default/admin/params/elastic.html.tmpl @@ -11,8 +11,8 @@ %] [% param_descs = { + elasticsearch => "Enable or disable elasticsearch feature." elasticsearch_nodes => - "If this option is set, $terms.Bugzilla will integrate with Elasticsearch. " _ "Specify one of more server, separated by spaces, using hostname[:port] " _ "notation (for example: localhost).", diff --git a/template/en/default/global/setting-descs.none.tmpl b/template/en/default/global/setting-descs.none.tmpl index 368987da6..ba001ab6d 100644 --- a/template/en/default/global/setting-descs.none.tmpl +++ b/template/en/default/global/setting-descs.none.tmpl @@ -56,6 +56,7 @@ "possible_duplicates" => "Display possible duplicates when reporting a new $terms.bug", "requestee_cc" => "Automatically add me to the CC list of $terms.bugs I am requested to review", "api_key_only" => "Require API key authentication for API requests", + "use_elasticsearch" => "Use elasticsearch for $terms.bug searches when possible", } %] |