diff options
| author | Byron Jones <glob@mozilla.com> | 2015-01-23 07:25:19 +0100 |
|---|---|---|
| committer | Byron Jones <glob@mozilla.com> | 2015-01-23 07:25:19 +0100 |
| commit | c00b9c39f36784b86287f8f8d142a7b33200e2a5 (patch) | |
| tree | 35902cb4f442b104ecfc5afb6b7da0f422791389 | |
| parent | d7a8c55615daffeea41e81ffb04201f944e6b408 (diff) | |
| download | bugzilla-c00b9c39f36784b86287f8f8d142a7b33200e2a5.tar.gz bugzilla-c00b9c39f36784b86287f8f8d142a7b33200e2a5.tar.xz | |
Bug 1117345: Can't choose a resolution when trying to resolve a bug (with canconfirm rights)
| -rw-r--r-- | extensions/BMO/Extension.pm | 8 | ||||
| -rw-r--r-- | template/en/default/bug/field.html.tmpl | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm index 458be737f..75ca30d8d 100644 --- a/extensions/BMO/Extension.pm +++ b/extensions/BMO/Extension.pm @@ -512,13 +512,17 @@ sub bug_check_can_change_field { { push (@$priv_results, PRIVILEGES_REQUIRED_NONE); } - elsif ($field eq 'resolution' && + elsif ($field eq 'resolution' && ($new_value eq 'DUPLICATE' || $new_value eq 'WORKSFORME' || - $new_value eq 'INCOMPLETE')) + $new_value eq 'INCOMPLETE' || + ($old_value eq '' && $new_value eq '1'))) { push (@$priv_results, PRIVILEGES_REQUIRED_NONE); } + elsif ($field eq 'dup_id') { + push (@$priv_results, PRIVILEGES_REQUIRED_NONE); + } } elsif ($field eq 'bug_status') { # Disallow reopening of bugs which have been resolved for > 1 year diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl index e9eefd419..8492b1615 100644 --- a/template/en/default/bug/field.html.tmpl +++ b/template/en/default/bug/field.html.tmpl @@ -138,7 +138,7 @@ [% r = legal_value.name %] [% IF bug.user.canconfirm && !(bug.user.canedit || bug.user.isreporter) %] - [% NEXT IF r != "WORKSFORME" && r != "INCOMPLETE" %] + [% NEXT IF r != "WORKSFORME" && r != "INCOMPLETE" && r != "DUPLICATE" %] [% END %] [% IF bug.user.isreporter && !(bug.user.canconfirm || bug.user.canedit) %] |