diff options
| author | Sunil Joshi <joshi_sunil@in.com> | 2013-08-08 19:10:19 +0200 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2013-08-08 19:10:19 +0200 |
| commit | b50767fb05e2c2035081d75da3f7d69e17aa40b0 (patch) | |
| tree | ebe9f8dc3d1b46c3bfc5f8e57429c6a173dc0224 | |
| parent | beea589302cd06252a5b7165e54bc0d53772e6fa (diff) | |
| download | bugzilla-b50767fb05e2c2035081d75da3f7d69e17aa40b0.tar.gz bugzilla-b50767fb05e2c2035081d75da3f7d69e17aa40b0.tar.xz | |
Bug 669535 - User pref for "Possible Duplicates"
r=dkl,a=glob
| -rw-r--r-- | Bugzilla/Install.pm | 2 | ||||
| -rw-r--r-- | template/en/default/bug/create/create.html.tmpl | 3 | ||||
| -rw-r--r-- | template/en/default/global/setting-descs.none.tmpl | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Bugzilla/Install.pm b/Bugzilla/Install.pm index 258adf811..41f88d70b 100644 --- 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 9c7775f07..66c5dfff9 100644 --- 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 d20068306..6e3358782 100644 --- 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", } %] |