diff options
| author | David Lawrence <dkl@mozilla.com> | 2016-09-27 15:55:12 +0200 |
|---|---|---|
| committer | David Lawrence <dkl@mozilla.com> | 2016-09-27 15:55:12 +0200 |
| commit | 8affa3eab39d5b438067f3b5b0490be597b19bbc (patch) | |
| tree | bf288ce157376b3166e6e5c62c65c7dfe91578c7 /template/en/default | |
| parent | 0ebea6d9fac5b7da3844829883ee76707c711061 (diff) | |
| download | bugzilla-8affa3eab39d5b438067f3b5b0490be597b19bbc.tar.gz bugzilla-8affa3eab39d5b438067f3b5b0490be597b19bbc.tar.xz | |
ug 1268317 - Add Triage Contact to Components as an Editable Field (everything else)
Diffstat (limited to 'template/en/default')
6 files changed, 37 insertions, 1 deletions
diff --git a/template/en/default/admin/components/confirm-delete.html.tmpl b/template/en/default/admin/components/confirm-delete.html.tmpl index da934f420..a3dae68bb 100644 --- a/template/en/default/admin/components/confirm-delete.html.tmpl +++ b/template/en/default/admin/components/confirm-delete.html.tmpl @@ -56,7 +56,10 @@ from '[% product.name FILTER html %]' product <td valign="top">Default QA contact:</td> <td valign="top">[% comp.default_qa_contact.login FILTER html %]</td> [% END %] - + </tr> +<tr> + <td valign="top">Triage Owner:</td> + <td valign="top">[% comp.triage_owner.login FILTER html %]</td> </tr> <tr> <td valign="top">Component of Product:</td> diff --git a/template/en/default/admin/components/edit-common.html.tmpl b/template/en/default/admin/components/edit-common.html.tmpl index 3e489af74..ffb67bbf7 100644 --- a/template/en/default/admin/components/edit-common.html.tmpl +++ b/template/en/default/admin/components/edit-common.html.tmpl @@ -66,6 +66,18 @@ </tr> [% END %] <tr> + <td class="field_label"><label for="triage_owner">Triage Owner:</label></th> + <td> + [% INCLUDE global/userselect.html.tmpl + name => "triage_owner" + id => "triage_owner" + value => comp.triage_owner.login + size => 64 + emptyok => 1 + %] + </td> +</tr> +<tr> <th class="field_label"><label for="initialcc">Default CC List:</label></th> <td> [% INCLUDE global/userselect.html.tmpl diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 93c137073..723753ae0 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -576,6 +576,18 @@ </tr> [% END %] + <tr> + <th class="field_label"> + <label for="triage_owner"> + <a href="page.cgi?id=fields.html#triage_owner"> + Triage Owner</a></label>: + </th> + <td> + [% INCLUDE global/user.html.tmpl who = bug.component_obj.triage_owner %] + </td> + </tr> + + [%# BMO - hook for adding mentors %] [% Hook.process("after_people", "bug/edit.html.tmpl") %] diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl index 971bf2f34..b74dd5ded 100644 --- a/template/en/default/global/confirm-user-match.html.tmpl +++ b/template/en/default/global/confirm-user-match.html.tmpl @@ -44,6 +44,7 @@ "initialcc" => "Default CC List", "initialowner" => "Default Assignee", "initialqacontact" => "Default QA Contact", + "triage_owner" => "Triage Owner", # Used by process_bug.cgi "masscc" => "CC List", # Used by request.cgi diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl index 1b8b765bf..ff29ff184 100644 --- a/template/en/default/global/field-descs.none.tmpl +++ b/template/en/default/global/field-descs.none.tmpl @@ -143,6 +143,7 @@ "status_whiteboard" => "Whiteboard", "tag.name" => "Tags", "target_milestone" => "Target Milestone", + "triage_owner" => "Triage Owner", "version" => "Version", "work_time" => "Hours Worked", } %] diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index b5c75bcc3..b2430b7ed 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -233,6 +233,13 @@ <li>Default QA contact deleted</li> [% END %] [% END %] + [% IF changes.triage_owner_id.defined %] + [% IF comp.triage_owner.id %] + <li>Triage owner updated to '[% comp.triage_owner.login FILTER html %]'</li> + [% ELSE %] + <li>Triage owner deleted</li> + [% END %] + [% END %] [% IF changes.cc_list.defined %] [% IF comp.initial_cc.size %] [% cc_list = [] %] |