diff options
Diffstat (limited to 'template/en/default/admin/users')
3 files changed, 9 insertions, 23 deletions
diff --git a/template/en/default/admin/users/confirm-delete.html.tmpl b/template/en/default/admin/users/confirm-delete.html.tmpl index b61a995..4711376 100644 --- a/template/en/default/admin/users/confirm-delete.html.tmpl +++ b/template/en/default/admin/users/confirm-delete.html.tmpl @@ -33,7 +33,6 @@ # namedquery_group_map: number of named queries the user has shared # profiles_activity: number of changes made to other users' profiles # series: number of series the viewed user has created - # votes: number of bugs the viewed user has voted on # watch.watched: number of users the viewed user is being watched # by # watch.watcher: number of users the viewed user is watching @@ -226,8 +225,8 @@ [% END %] [% IF assignee_or_qa || cc || component_cc || email_setting || flags.requestee || - namedqueries || profile_setting || quips || series || votes || watch.watched || - watch.watcher || whine_events || whine_schedules %] + namedqueries || profile_setting || quips || series || watch.watched || + watch.watcher || whine_events || whine_schedules || other_safe %] <div class="warningmessages"> <p>The following deletions are <b>safe</b> and will not generate referential integrity inconsistencies.</p> @@ -372,23 +371,6 @@ will have no author anymore, but will remain available. </li> [% END %] - [% IF votes %] - <li> - [% otheruser.login FILTER html %] has voted on - [% IF votes == 1 %] - [%+ terms.abug %] - [% ELSE %] - [%+ votes %] [%+ terms.bugs %] - [% END %]. - If you delete the user account, - [% IF votes == 1 %] - this vote - [% ELSE %] - these votes - [% END %] - will be deleted along with the user account. - </li> - [% END %] [% IF watch.watched || watch.watcher %] <li> [% otheruser.login FILTER html %] @@ -445,6 +427,7 @@ but the whines themselves will be left unaltered. </li> [% END %] + [% Hook.process('warn_safe') %] </ul> </div> diff --git a/template/en/default/admin/users/responsibilities.html.tmpl b/template/en/default/admin/users/responsibilities.html.tmpl index bbf121a..5c9c3f3 100644 --- a/template/en/default/admin/users/responsibilities.html.tmpl +++ b/template/en/default/admin/users/responsibilities.html.tmpl @@ -29,6 +29,7 @@ <th>Component</th> <th>Default Assignee</th> <th>Default QA Contact</th> + <th>Default CC</th> </tr> [% FOREACH component = item.components %] <tr> @@ -48,6 +49,9 @@ [% component.$responsibility.id == otheruser.id ? "X" : " " %] </td> [% END %] + <td class="center"> + [% component.initial_cc.contains(otheruser) ? "X" : " " %] + </td> </tr> [% END %] </tbody> diff --git a/template/en/default/admin/users/userdata.html.tmpl b/template/en/default/admin/users/userdata.html.tmpl index f23aa1b..9b182fa 100644 --- a/template/en/default/admin/users/userdata.html.tmpl +++ b/template/en/default/admin/users/userdata.html.tmpl @@ -61,9 +61,8 @@ <tr> <th><label for="password">Password:</label></th> <td> - <input type="password" size="16" maxlength="16" name="password" - autocomplete="off" - id="password" value="" /> + <input type="password" size="16" name="password" id="password" + value="" autocomplete="off" /> [% IF editform %]<br /> (Enter new password to change.) [% END %] |