Bug 38922: Default (Initial) CC list for each component

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=myk

3 files changed, 56 insertions, 2 deletions

diff --git a/template/en/default/admin/components/create.html.tmpl b/template/en/default/admin/components/create.html.tmpl
index 83c28ab85..013ee861e 100644
--- a/template/en/default/admin/components/create.html.tmpl
+++ b/template/en/default/admin/components/create.html.tmpl
@@ -17,6 +17,7 @@
   # Rights Reserved.
   #
   # Contributor(s): Gavin Shelley <bugzilla@chimpychompy.org>
+  #                 Akamai Technologies <bugzilla-dev@akamai.com>
   #%]
 
 [%# INTERFACE:
@@ -76,6 +77,24 @@
       </td>
     </tr>
 [% END %]
+    <tr>
+      <th align="right">
+        <label for="initialcc">Default CC List:</label>
+      </th>
+      <td>
+        [% INCLUDE global/userselect.html.tmpl
+           name => "initialcc"
+           id => "initialcc"
+           value => ""
+           size => 64
+           multiple => 5
+        %]
+        <br>
+        [% IF !Param("usemenuforusers") %]
+          <em>Enter user names for the CC in a comma-separated list.</em>
+        [% END %]
+      </td>
+    </tr>
   </table>
   <hr>
   <input type="submit" id="create" value="Add">
diff --git a/template/en/default/admin/components/edit.html.tmpl b/template/en/default/admin/components/edit.html.tmpl
index 9392cfd69..6ee3a69fe 100644
--- a/template/en/default/admin/components/edit.html.tmpl
+++ b/template/en/default/admin/components/edit.html.tmpl
@@ -17,6 +17,7 @@
   # Rights Reserved.
   #
   # Contributor(s): Gavin Shelley <bugzilla@chimpychompy.org>
+  #                 Akamai Technologies <bugzilla-dev@akamai.com>
   #%]
 
 [%# INTERFACE:
@@ -82,6 +83,24 @@
   
     </tr>
     <tr>
+      <td valign="top">
+        <label for="initialcc">Default CC List:</label>
+      </td>
+      <td>
+        [% INCLUDE global/userselect.html.tmpl
+           name     => "initialcc"
+           id       => "initialcc"
+           value    => initial_cc_names
+           size     => 64
+           multiple => 5
+        %]
+        <br>
+        [% IF !Param("usemenuforusers") %]
+          <em>Enter user names for the CC in a comma-separated list.</em>
+        [% END %]
+      </td>
+    </tr>
+    <tr>
       <td>[% terms.Bugs %]:</td>
       <td>
 [% IF comp.bug_count > 0 %]
diff --git a/template/en/default/admin/components/updated.html.tmpl b/template/en/default/admin/components/updated.html.tmpl
index 43214f979..a6f2c8b9d 100644
--- a/template/en/default/admin/components/updated.html.tmpl
+++ b/template/en/default/admin/components/updated.html.tmpl
@@ -17,6 +17,8 @@
   # Rights Reserved.
   #
   # Contributor(s): Gavin Shelley <bugzilla@chimpychompy.org>
+  #                 Akamai Technologies <bugzilla-dev@akamai.com>
+  #                 Max Kanat-Alexander <mkanat@bugzilla.org>
   #%]
 
 [%# INTERFACE:
@@ -32,10 +34,15 @@
   #
   # updated_initialqacontact: the default qa contact updated
   #
+  # updated_initialcc: the default initial cc list
+  #
   # comp: object; Bugzilla::Component object representing the component 
   #               user updated.
   # product: object; Bugzilla::Product object representing the product to
   #               which the component belongs.
+  #
+  # initial_cc_names: a comma-separated list of the login names of
+  #                   the Initial CC, if it was updated.
   #%]
   
 [% title = BLOCK %]Updating Component '[% comp.name FILTER html %]' of Product
@@ -72,11 +79,20 @@
   <p>Updated Component name to: '[% comp.name FILTER html %]'.</p>
 [% END %]
 
+[% IF updated_initialcc %]
+  [% IF initial_cc_names %]
+    <p>Updated Default CC list to:
+      '[% initial_cc_names FILTER html %]'.</p>
+  [% ELSE %]
+    <p>Removed the Default CC list.</p>
+  [% END %]
+[% END %]
+
 [% UNLESS updated_description || updated_initialowner || 
-          updated_initialqacontact || updated_name %]
+          updated_initialqacontact || updated_name  ||
+          updated_initialcc %]
   <p>Nothing changed for component '[% comp.name FILTER html %]'.
 [% END %]
-   
 
 [% PROCESS admin/components/footer.html.tmpl %]