From 8affa3eab39d5b438067f3b5b0490be597b19bbc Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Tue, 27 Sep 2016 13:55:12 +0000 Subject: ug 1268317 - Add Triage Contact to Components as an Editable Field (everything else) --- .../en/default/admin/components/confirm-delete.html.tmpl | 5 ++++- template/en/default/admin/components/edit-common.html.tmpl | 12 ++++++++++++ template/en/default/bug/edit.html.tmpl | 12 ++++++++++++ template/en/default/global/confirm-user-match.html.tmpl | 1 + template/en/default/global/field-descs.none.tmpl | 1 + template/en/default/global/messages.html.tmpl | 7 +++++++ 6 files changed, 37 insertions(+), 1 deletion(-) (limited to 'template/en/default') 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 Default QA contact: [% comp.default_qa_contact.login FILTER html %] [% END %] - + + + Triage Owner: + [% comp.triage_owner.login FILTER html %] Component of Product: 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 @@ -65,6 +65,18 @@ [% END %] + + + + [% INCLUDE global/userselect.html.tmpl + name => "triage_owner" + id => "triage_owner" + value => comp.triage_owner.login + size => 64 + emptyok => 1 + %] + + 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 @@ [% END %] + + + : + + + [% INCLUDE global/user.html.tmpl who = bug.component_obj.triage_owner %] + + + + [%# 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 @@
  • Default QA contact deleted
  • [% END %] [% END %] + [% IF changes.triage_owner_id.defined %] + [% IF comp.triage_owner.id %] +
  • Triage owner updated to '[% comp.triage_owner.login FILTER html %]'
  • + [% ELSE %] +
  • Triage owner deleted
  • + [% END %] + [% END %] [% IF changes.cc_list.defined %] [% IF comp.initial_cc.size %] [% cc_list = [] %] -- cgit v1.2.3-24-g4f1b