From 833ecab083728f7ceed779b9a2d5daa028688fcc Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@redhat.com>
Date: Thu, 26 Jun 2014 17:12:31 +0000
Subject: Bug 669535 - User pref for "Possible Duplicates" - Discussed with
 glob and decided to straight backport to BMO

---
 template/en/default/bug/create/create.html.tmpl    | 3 ++-
 template/en/default/global/setting-descs.none.tmpl | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'template/en/default')

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') %]
-- 
cgit v1.2.3-24-g4f1b