summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorDavid Lawrence <dkl@redhat.com>2014-06-26 19:12:31 +0200
committerDavid Lawrence <dkl@redhat.com>2014-06-26 19:12:31 +0200
commit833ecab083728f7ceed779b9a2d5daa028688fcc (patch)
tree4853f6a8b08b282909aee42fe580aca18e132286 /template
parentdc2d0755dd68bc6346f2e8fede6e3fcaed3fc297 (diff)
downloadbugzilla-833ecab083728f7ceed779b9a2d5daa028688fcc.tar.gz
bugzilla-833ecab083728f7ceed779b9a2d5daa028688fcc.tar.xz
Bug 669535 - User pref for "Possible Duplicates"
- Discussed with glob and decided to straight backport to BMO
Diffstat (limited to 'template')
-rw-r--r--template/en/default/bug/create/create.html.tmpl3
-rw-r--r--template/en/default/global/setting-descs.none.tmpl3
2 files changed, 4 insertions, 2 deletions
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 2e3ba66c6..14f40fe55 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -473,7 +473,8 @@ TUI_hide_default('attachment_text_field');
</td>
</tr>
- [% IF feature_enabled('jsonrpc') AND !cloned_bug_id %]
+ [% IF feature_enabled('jsonrpc') AND !cloned_bug_id
+ AND user.settings.possible_duplicates.value == 'on' %]
<tr id="possible_duplicates_container" class="bz_default_hidden">
<th>Possible<br>Duplicates:</th>
<td colspan="3">
diff --git a/template/en/default/global/setting-descs.none.tmpl b/template/en/default/global/setting-descs.none.tmpl
index 37d81039e..5ba100183 100644
--- a/template/en/default/global/setting-descs.none.tmpl
+++ b/template/en/default/global/setting-descs.none.tmpl
@@ -53,8 +53,9 @@
"html" => "HTML",
"text_only" => "Text Only",
"bugmail_new_prefix" => "Add 'New:' to subject line of email sent when a new $terms.bug is filed",
+ "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",
- }
+ }
%]
[% Hook.process('settings') %]