Bug 669535 - User pref for "Possible Duplicates"

r=dkl,a=glob

diff --git a/Bugzilla/Install.pm b/Bugzilla/Install.pm
index 258adf8114d048b8798cf2e152279ba366ae8657..41f88d70b326b2ff6a199c5a597ea7fa39634ca7 100644 (file)
--- a/Bugzilla/Install.pm
+++ b/Bugzilla/Install.pm
@@ -87,6 +87,8 @@ sub SETTINGS {
     requestee_cc       => { options => ['on', 'off'], default => 'on' },
     # 2012-04-30 glob@mozilla.com -- Bug 663747
     bugmail_new_prefix => { options => ['on', 'off'], default => 'on' },
+    # 2013-07-26 joshi_sunil@in.com -- Bug 669535
+    possible_duplicates => { options => ['on', 'off'], default => 'on' },
     }
 };
 

diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 9c7775f078466e49ea3e58a0ab8799cf071706e3..66c5dfff96c4bfb3735d06972d1aa984b1cba93e 100644 (file)
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -491,7 +491,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 d20068306a5a33fae0f71ffc6dd8c85aca943b07..6e3358782786754f32604b5292057f2da76d87e9 100644 (file)
--- a/template/en/default/global/setting-descs.none.tmpl
+++ b/template/en/default/global/setting-descs.none.tmpl
@@ -43,6 +43,7 @@
    "text_only"                        => "Text Only",
    "requestee_cc"                     => "Automatically add me to the CC list of $terms.bugs I am requested to review",
    "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", 
                    } 
 %]