diff options
Diffstat (limited to 'template/en/default')
| -rw-r--r-- | template/en/default/bug/edit.html.tmpl | 29 | ||||
| -rw-r--r-- | template/en/default/bug/knob.html.tmpl | 43 | ||||
| -rw-r--r-- | template/en/default/global/userselect.html.tmpl | 11 | ||||
| -rw-r--r-- | template/en/default/list/edit-multiple.html.tmpl | 49 |
4 files changed, 55 insertions, 77 deletions
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index c97077d69..037ea443d 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -667,7 +667,7 @@ [%############################################################################%] [% BLOCK section_people %] - <table cellpadding="1" cellspacing="1"> + <table cellpadding="3" cellspacing="1"> <tr> <td align="right"> <b>Reporter</b>: @@ -678,20 +678,34 @@ </tr> <tr> - <td align="right"> - <b><a href="page.cgi?id=fields.html#assigned_to">Assigned To</a></b>: + <td align="right" valign="top"> + <b><a href="page.cgi?id=fields.html#assigned_to">Assignee</a></b>: </td> <td> - [% INCLUDE user_identity user => bug.assigned_to %] + [% IF bug.check_can_change_field("assigned_to", 0, 1) %] + [% INCLUDE global/userselect.html.tmpl + id => "assigned_to" + name => "assigned_to" + value => bug.assigned_to.login + size => 30 + %] + <br> + <input type="checkbox" id="set_default_assignee" name="set_default_assignee" value="1"> + <label for="set_default_assignee">Reset Assignee to default</label> + [% ELSE %] + <input type="hidden" name="assigned_to" id="assigned_to" + value="[% bug.assigned_to.login FILTER html %]"> + [% INCLUDE user_identity user => bug.assigned_to %] + [% END %] </td> </tr> [% IF Param('useqacontact') %] <tr> - <td align="right"> + <td align="right" valign="top"> <label for="qa_contact" accesskey="q"><b><u>Q</u>A Contact</b></label>: </td> - <td colspan="7"> + <td> [% IF bug.check_can_change_field("qa_contact", 0, 1) %] [% INCLUDE global/userselect.html.tmpl id => "qa_contact" @@ -700,6 +714,9 @@ size => 30 emptyok => 1 %] + <br> + <input type="checkbox" id="set_default_qa_contact" name="set_default_qa_contact" value="1"> + <label for="set_default_qa_contact">Reset QA Contact to default</label> [% ELSE %] <input type="hidden" name="qa_contact" id="qa_contact" value="[% bug.qa_contact.login FILTER html %]"> diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl index 12f1adf65..0e1a928f4 100644 --- a/template/en/default/bug/knob.html.tmpl +++ b/template/en/default/bug/knob.html.tmpl @@ -76,49 +76,6 @@ [% PROCESS select_resolution %] [% PROCESS duplicate %] - - [% IF bug.user.canedit %] - <input type="radio" id="knob-reassign" name="knob" value="reassign"> - <label for="knob-reassign"> - <a href="page.cgi?id=fields.html#assigned_to">Reassign</a> - [% terms.bug %] to - </label> - [% safe_assigned_to = FILTER js; bug.assigned_to.login; END %] - [% INCLUDE global/userselect.html.tmpl - id => "assigned_to" - name => "assigned_to" - value => bug.assigned_to.login - size => 32 - onchange => "if ((this.value != '$safe_assigned_to') && (this.value != '')) { - document.changeform.knob[$knum].checked=true; - }" - %] - <br> - [% IF bug.isunconfirmed && bug.user.canconfirm %] - <input type="checkbox" id="andconfirm" name="andconfirm"> - <label for="andconfirm"> - and confirm [% terms.bug %] (change status to <b>[% get_status("NEW") FILTER html %]</b>) - </label> - <br> - [% END %] - [% knum = knum + 1 %] - - <input type="radio" id="knob-reassign-cmp" name="knob" value="reassignbycomponent"> - <label for="knob-reassign-cmp"> - Reassign [% terms.bug %] to default assignee - [% " and QA contact," IF Param('useqacontact') %] - and add Default CC of selected component - </label> - <br> - [% IF bug.isunconfirmed && bug.user.canconfirm %] - <input type="checkbox" id="compconfirm" name="compconfirm"> - <label for="compconfirm"> - and confirm [% terms.bug %] (change status to <b>[% get_status("NEW") FILTER html %]</b>) - </label> - <br> - [% END %] - [% knum = knum + 1 %] - [% END %] [% ELSE %] [% IF bug.resolution != "MOVED" || (bug.resolution == "MOVED" && bug.user.canmove) %] diff --git a/template/en/default/global/userselect.html.tmpl b/template/en/default/global/userselect.html.tmpl index 7a46891ab..398300b52 100644 --- a/template/en/default/global/userselect.html.tmpl +++ b/template/en/default/global/userselect.html.tmpl @@ -15,8 +15,6 @@ #%] [%# INTERFACE: - # userlist: select only; array reference with list of users and identities - # userlist is built by Bugzilla::User::get_userlist() # name: mandatory; field name # id: optional; field id # value: optional; default field value/selection @@ -26,7 +24,7 @@ # size: optional, input only; size attribute value # emptyok: optional, select only; if true, prepend menu option to start of select # multiple: optional, do multiselect box, value is size (height) of box - # + # do_not_change: optional, contains the string meaning "do not alter this role" #%] [% IF Param("usemenuforusers") %] @@ -40,6 +38,13 @@ [% IF emptyok %] <option value=""></option> [% END %] + + [% IF do_not_change %] + <option value="[% do_not_change FILTER html %]"> + [% do_not_change FILTER html %] + </option> + [% END %] + [% FOREACH tmpuser = user.get_userlist %] [% IF tmpuser.visible OR value.match("\\b$tmpuser.login\\b") %] <option value="[% tmpuser.login FILTER html %]" diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl index 0dc91681c..667ad1b27 100644 --- a/template/en/default/list/edit-multiple.html.tmpl +++ b/template/en/default/list/edit-multiple.html.tmpl @@ -150,14 +150,34 @@ </tr> [% END %] + <tr> + <th><label for="assigned_to">Assignee:</label></th> + <td colspan="3"> + [% INCLUDE global/userselect.html.tmpl + id => "assigned_to" + name => "assigned_to" + value => dontchange + do_not_change => dontchange + size => 32 + %] + <input type="checkbox" id="set_default_assignee" name="set_default_assignee" value="1"> + <label for="set_default_assignee">Reset Assignee to default</label> + </td> + </tr> + [% IF Param("useqacontact") %] <tr> <th><label for="qa_contact">QA Contact:</label></th> <td colspan="3"> - <input id="qa_contact" - name="qa_contact" - value="[% dontchange FILTER html %]" - size="32"> + [% INCLUDE global/userselect.html.tmpl + id => "qa_contact" + name => "qa_contact" + value => dontchange + do_not_change => dontchange + size => 32 + %] + <input type="checkbox" id="set_default_qa_contact" name="set_default_qa_contact" value="1"> + <label for="set_default_qa_contact">Reset QA Contact to default</label> </td> </tr> [% END %] @@ -336,27 +356,6 @@ <label for="knob-close">Mark [% terms.bugs %] as <b>[% get_status("CLOSED") FILTER html %]</b></label><br> [% END %] -[% knum = knum + 1 %] -<input id="knob-reassign" type="radio" name="knob" value="reassign"> -<label for="knob-reassign"><a href="page.cgi?id=fields.html#assigned_to"> - Reassign</a> [% terms.bugs %] to -</label> -[% INCLUDE global/userselect.html.tmpl - name => "assigned_to" - value => user.login - size => 32 - onchange => "document.forms.changeform.knob[$knum].checked=true;" -%]<br> - -[% knum = knum + 1 %] -<input id="knob-reassignbycomponent" - type="radio" - name="knob" - value="reassignbycomponent"> -<label for="knob-reassignbycomponent"> - Reassign [% terms.bugs %] to default assignee of selected component -</label><br> - <input type="submit" id="commit" value="Commit"> [% IF Param('move-enabled') && user.is_mover %] |