summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/admin/users/confirm-delete.html.tmpl31
-rw-r--r--template/en/default/admin/users/edit.html.tmpl13
-rw-r--r--template/en/default/filterexceptions.pl2
3 files changed, 13 insertions, 33 deletions
diff --git a/template/en/default/admin/users/confirm-delete.html.tmpl b/template/en/default/admin/users/confirm-delete.html.tmpl
index 0fd4aafa7..5b28aad75 100644
--- a/template/en/default/admin/users/confirm-delete.html.tmpl
+++ b/template/en/default/admin/users/confirm-delete.html.tmpl
@@ -55,12 +55,6 @@
listselectionvalues = listselectionvalues
%]
-[% responsibilityterms = {
- 'default_assignee' => 'Default Assignee',
- 'default_qa_contact' => 'Default QA Contact'
- }
-%]
-
<table class="main">
<tr>
<th>Login name:</th>
@@ -88,30 +82,7 @@
<tr>
<th>Product responsibilities:</th>
<td>
- <ul>
- [% FOREACH component = otheruser.product_responsibilities %]
- <li>
- [% andstring = '' %]
- [% FOREACH responsibility = ['default_assignee', 'default_qa_contact'] %]
- [% IF component.${responsibility}.id == otheruser.id %]
- [% andstring %] [% responsibilityterms.$responsibility %]
- [% andstring = ' and ' %]
- [% END %]
- [% END %]
- for
- [% IF user.in_group("editcomponents", component.product_id) %]
- <a href="editcomponents.cgi?action=edit&amp;product=
- [% component.product.name FILTER url_quote %]&amp;component=
- [% component.name FILTER url_quote %]">
- [% END %]
- [%+ component.product.name FILTER html %]:
- [% component.name FILTER html %]
- [% IF user.in_group("editcomponents", component.product_id) %]
- </a>
- [% END %]
- </li>
- [% END %]
- </ul>
+ [% PROCESS admin/users/responsibilities.html.tmpl otheruser = otheruser %]
</td>
</tr>
[% END %]
diff --git a/template/en/default/admin/users/edit.html.tmpl b/template/en/default/admin/users/edit.html.tmpl
index 5712b6f57..ab7369a23 100644
--- a/template/en/default/admin/users/edit.html.tmpl
+++ b/template/en/default/admin/users/edit.html.tmpl
@@ -30,7 +30,7 @@
[% PROCESS global/header.html.tmpl
title = title
message = message
- style_urls = ['skins/standard/editusers.css']
+ style_urls = ['skins/standard/admin.css', 'skins/standard/editusers.css']
%]
[% PROCESS admin/users/listselectvars.html.tmpl
@@ -96,6 +96,17 @@
</td>
</tr>
[% END %]
+
+ <tr>
+ <th>Product responsibilities:</th>
+ <td>
+ [% IF otheruser.product_responsibilities.size %]
+ [% PROCESS admin/users/responsibilities.html.tmpl otheruser = otheruser %]
+ [% ELSE %]
+ <em>none</em>
+ [% END %]
+ </td>
+ </tr>
</table>
<p>
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index f605ca82e..cc2e060ee 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -518,8 +518,6 @@
],
'admin/users/confirm-delete.html.tmpl' => [
- 'andstring',
- 'responsibilityterms.$responsibility',
'reporter',
'assignee_or_qa',
'cc',