summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authormkanat%bugzilla.org <>2006-09-21 06:57:57 +0200
committermkanat%bugzilla.org <>2006-09-21 06:57:57 +0200
commitc6433b10999a9bfe1f26bea4deaba11db3251fc0 (patch)
tree49a274adb031a18a9b3bd7f2641cc9d92a9f5449 /template/en
parentf90a0b775e927aad00631ce80d282186a3022af5 (diff)
downloadbugzilla-c6433b10999a9bfe1f26bea4deaba11db3251fc0.tar.gz
bugzilla-c6433b10999a9bfe1f26bea4deaba11db3251fc0.tar.xz
Bug 38922: Default (Initial) CC list for each component
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=myk
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/admin/components/create.html.tmpl19
-rw-r--r--template/en/default/admin/components/edit.html.tmpl19
-rw-r--r--template/en/default/admin/components/updated.html.tmpl20
-rw-r--r--template/en/default/bug/create/create.html.tmpl26
-rw-r--r--template/en/default/bug/knob.html.tmpl4
5 files changed, 83 insertions, 5 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 %]
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 26e95523b..eb3aea2e4 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -20,6 +20,8 @@
# Ville Skyttä <ville.skytta@iki.fi>
# Shane H. W. Travis <travis@sedsystems.ca>
# Marc Schumann <wurblzap@gmail.com>
+ # Akamai Technologies <bugzilla-dev@akamai.com>
+ # Max Kanat-Alexander <mkanat@bugzilla.org>
#%]
[% PROCESS "global/field-descs.none.tmpl" %]
@@ -28,7 +30,6 @@
title = "Enter $terms.Bug: $product.name"
style_urls = [ 'skins/standard/create_attachment.css' ]
javascript_urls = [ "js/attachment.js" ]
- onload="set_assign_to();"
%]
<script type="text/javascript">
@@ -36,6 +37,7 @@
var initialowners = new Array([% product.components.size %]);
var last_initialowner;
+var initialccs = new Array([% product.components.size %]);
var components = new Array([% product.components.size %]);
var flags = new Array([% product.components.size %]);
[% IF Param("useqacontact") %]
@@ -60,6 +62,13 @@ var flags = new Array([% product.components.size %]);
[% IF Param("useqacontact") %]
initialqacontacts[[% count %]] = "[% c.default_qa_contact.login FILTER js %]";
[% END %]
+
+ [% SET initial_cc_list = [] %]
+ [% FOREACH cc_user = c.initial_cc %]
+ [% initial_cc_list.push(cc_user.login) %]
+ [% END %]
+ initialccs[[% count %]] = "[% initial_cc_list.join(', ') FILTER js %]";
+
[% count = count + 1 %]
[%- END %]
@@ -90,6 +99,9 @@ function set_assign_to() {
form.assigned_to.value = owner;
last_initialowner = owner;
}
+
+ document.getElementById('initial_cc').innerHTML = initialccs[index];
+
[% IF Param("useqacontact") %]
var contact = initialqacontacts[index];
if (qa_contact == last_initialqacontact
@@ -317,6 +329,18 @@ function handleWantsAttachment(wants_attachment) {
%]
</td>
</tr>
+
+ <tr>
+ <th align="right">Default CC:</th>
+ <td colspan="2">
+ <div id="initial_cc">
+ <!-- This has to happen after everything above renders,
+ and onload doesn't work. So this is as good a place
+ as any to put it. -->
+ <script type="text/javascript">set_assign_to();</script>
+ </div>
+ </td>
+ </tr>
<tr>
<td>&nbsp;</td>
diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl
index 36712911e..00ffcb053 100644
--- a/template/en/default/bug/knob.html.tmpl
+++ b/template/en/default/bug/knob.html.tmpl
@@ -104,8 +104,8 @@
<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') %]
- of selected component
+ [% " and QA contact" IF Param('useqacontact') %],
+ and add Default CC, of selected component
</label>
<br>
[% IF bug.isunconfirmed && bug.user.canconfirm %]