Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@239645 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
lpsolit%gmail.com
2007-11-19 12:45:32 +00:00
parent 7c6898c1ab
commit 3a77d792fb
2 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/webtools/bugzilla/editusers.cgi
View File

@@ -551,9 +551,6 @@ if ($action eq 'search') {
}
# 2) Whines
my $sth_whineidFromSchedules = $dbh->prepare(
qq{SELECT eventid FROM whine_schedules
WHERE mailto = ? AND mailto_type = ?});
my $sth_whineidFromEvents = $dbh->prepare(
'SELECT id FROM whine_events WHERE owner_userid = ?');
my $sth_deleteWhineEvent = $dbh->prepare(
@@ -563,12 +560,8 @@ if ($action eq 'search') {
my $sth_deleteWhineSchedule = $dbh->prepare(
'DELETE FROM whine_schedules WHERE eventid = ?');
$sth_whineidFromSchedules->execute($otherUserID, MAILTO_USER);
while ($id = $sth_whineidFromSchedules->fetchrow_array()) {
$sth_deleteWhineQuery->execute($id);
$sth_deleteWhineSchedule->execute($id);
$sth_deleteWhineEvent->execute($id);
}
$dbh->do('DELETE FROM whine_schedules WHERE mailto = ? AND mailto_type = ?',
undef, ($otherUserID, MAILTO_USER));
$sth_whineidFromEvents->execute($otherUserID);
while ($id = $sth_whineidFromEvents->fetchrow_array()) {

38
mozilla/webtools/bugzilla/template/en/default/admin/users/confirm-delete.html.tmpl
View File

@@ -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 %]