summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2007-11-19 19:43:08 +0100
committerlpsolit%gmail.com <>2007-11-19 19:43:08 +0100
commit1040bda8cc6c2017ecda26bdcbb95f1d64398d1e (patch)
tree18605960c5e4af8d4598065867b4e0701e7087bc /template
parent68312cf980e2b7d7f55d48fd9102d8480404a1a6 (diff)
downloadbugzilla-1040bda8cc6c2017ecda26bdcbb95f1d64398d1e.tar.gz
bugzilla-1040bda8cc6c2017ecda26bdcbb95f1d64398d1e.tar.xz
Bug 395924: Deleting a user account may delete other user's whine - Patch by Frédéric Buclin <LpSolit@gmail.com> r=wurblzap a=LpSolit
Diffstat (limited to 'template')
-rw-r--r--template/en/default/admin/users/confirm-delete.html.tmpl38
1 files changed, 19 insertions, 19 deletions
diff --git a/template/en/default/admin/users/confirm-delete.html.tmpl b/template/en/default/admin/users/confirm-delete.html.tmpl
index 52c98f0b1..218775dca 100644
--- a/template/en/default/admin/users/confirm-delete.html.tmpl
+++ b/template/en/default/admin/users/confirm-delete.html.tmpl
@@ -372,27 +372,15 @@
will cease along with the deletion of the user account.
</li>
[% END %]
- [% IF whine_events || whine_schedules %]
+ [% IF whine_events %]
<li>
- [% otheruser.login FILTER html %]
- [% IF whine_events %]
- has scheduled
- [% IF whine_events == 1 %]
- a whine
- [% ELSE %]
- [%+ whine_events %] whines
- [% END %]
- [% END %]
- [% IF whine_schedules %]
- [%+ 'and' IF whine_events %]
- is on the receiving end of
- [% IF whine_schedules == 1 %]
- a whine
- [% ELSE %]
- [%+ whine_schedules %] whines
- [% END %]
+ [% otheruser.login FILTER html %] has scheduled
+ [% IF whine_events == 1 %]
+ a whine
+ [% ELSE %]
+ [%+ whine_events %] whines
[% END %].
- [% IF whine_events + whine_schedules == 1 %]
+ [% IF whine_events == 1 %]
This whine
[% ELSE %]
These whines
@@ -400,6 +388,18 @@
will be deleted along with the user account.
</li>
[% END %]
+ [% IF whine_schedules %]
+ <li>
+ [% otheruser.login FILTER html %] is on the receiving end of
+ [% IF whine_schedules == 1 %]
+ a whine
+ [% ELSE %]
+ [%+ whine_schedules %] whines
+ [% END %].
+ The corresponding schedules will be deleted along with the user account,
+ but the whines themselves will be left unaltered.
+ </li>
+ [% END %]
</ul>
</div>
[% display_warning = 1 %]