diff options
Diffstat (limited to 'template/en/default')
| -rw-r--r-- | template/en/default/bug/knob.html.tmpl | 54 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 5 |
2 files changed, 35 insertions, 24 deletions
diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl index c76251ae9..9f9e73f41 100644 --- a/template/en/default/bug/knob.html.tmpl +++ b/template/en/default/bug/knob.html.tmpl @@ -72,24 +72,9 @@ Resolve [% terms.bug %], changing <a href="page.cgi?id=fields.html#resolution">resolution</a> to </label> - <select name="resolution" - onchange="document.changeform.knob[[% knum %]].checked=true"> - [% FOREACH r = bug.choices.resolution %] - <option value="[% r FILTER html %]">[% resolution_descs.${r} FILTER html %]</option> - [% END %] - </select> - <br> - [% knum = knum + 1 %] - - <input type="radio" id="knob-duplicate" name="knob" value="duplicate"> - <label for="knob-duplicate"> - Resolve [% terms.bug %], mark it as duplicate of [% terms.bug %] # - </label> - <input name="dup_id" size="6" - onchange="if (this.value != '') - {document.changeform.knob[[% knum %]].checked=true}"> - <br> - [% knum = knum + 1 %] + [% PROCESS select_resolution %] + + [% PROCESS duplicate %] [% IF bug.user.canedit %] <input type="radio" id="knob-reassign" name="knob" value="reassign"> @@ -135,6 +120,14 @@ [% ELSE %] [% IF bug.resolution != "MOVED" || (bug.resolution == "MOVED" && bug.user.canmove) %] + <input type="radio" id="knob-change-resolution" name="knob" value="change_resolution"> + <label for="knob-change-resolution"> + Change <a href="page.cgi?id=fields.html#resolution">resolution</a> to + </label> + [% PROCESS select_resolution %] + + [% PROCESS duplicate %] + <input type="radio" id="knob-reopen" name="knob" value="reopen"> <label for="knob-reopen"> Reopen [% terms.bug %] @@ -162,7 +155,6 @@ [% END %] <input type="submit" value="Commit"> - <input type="hidden" name="form_name" value="process_bug"> <p> <font size="+1"> <b> @@ -186,3 +178,27 @@ [% END %] </p> + +[%# Common actions %] + +[% BLOCK select_resolution %] + <select name="resolution" + onchange="document.changeform.knob[[% knum %]].checked=true"> + [% FOREACH r = bug.choices.resolution %] + <option value="[% r FILTER html %]">[% resolution_descs.${r} FILTER html %]</option> + [% END %] + </select> + <br> + [% knum = knum + 1 %] +[% END %] + +[% BLOCK duplicate %] + <input type="radio" id="knob-duplicate" name="knob" value="duplicate"> + <label for="knob-duplicate"> + Mark the [% terms.bug %] as duplicate of [% terms.bug %] # + </label> + <input name="dup_id" size="6" + onchange="if (this.value != '') {document.changeform.knob[[% knum %]].checked=true}"> + <br> + [% knum = knum + 1 %] +[% END %] diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index c217b2347..6e029e1f5 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -320,11 +320,6 @@ [% title = "Description Required" %] You must provide a description of the [% terms.bug %]. - [% ELSIF error == "dupe_entry_found" %] - [% title = "Already marked as duplicate" %] - This [% terms.bug %] has already been marked as a duplicate - of [% terms.bug %] [%+ dupe_of FILTER html %]. - [% ELSIF error == "dupe_not_allowed" %] [% title = "Cannot mark $terms.bugs as duplicates" %] You cannot mark [% terms.bugs %] as duplicates when |