Bug 86328: Deleting bugs doesn't delete dependent records properly - Patch by Frederic Buclin <LpSolit@gmail.com> r=wurblzap a=justdave

2 files changed, 13 insertions, 61 deletions

diff --git a/template/en/default/admin/versions/confirm-delete.html.tmpl b/template/en/default/admin/versions/confirm-delete.html.tmpl
index 5f9b93943..acc20aeca 100644
--- a/template/en/default/admin/versions/confirm-delete.html.tmpl
+++ b/template/en/default/admin/versions/confirm-delete.html.tmpl
@@ -17,6 +17,7 @@
   # Rights Reserved.
   #
   # Contributor(s): Gavin Shelley <bugzilla@chimpychompy.org>
+  #                 Frédéric Buclin <LpSolit@gmail.com>
   #%]
 
 [%# INTERFACE:
@@ -67,46 +68,23 @@
   
 [% IF bug_count %]
 
-  [% IF !Param("allowbugdeletion") %]
-
-    Sorry, there
-
-    [% IF bug_count > 1 %] 
-      are [% bug_count %] [%+ terms.bugs %] 
-    [% ELSE %]
-      is [% bug_count %] [%+ terms.bug %] 
-    [% END %]
-
-    outstanding for this version. You must move 
-
-    [% IF bug_count > 1 %]
-       those [% terms.bugs %] 
-    [% ELSE %]
-       that [% terms.bug %]
-    [% END %]
-
-    to another version before you can delete this one.
-
+  Sorry, there
+  [% IF bug_count > 1 %] 
+    are [% bug_count %] [%+ terms.bugs %] 
   [% ELSE %]
+    is [% bug_count %] [%+ terms.bug %] 
+  [% END %]
 
-    <table border="0" cellpadding="20" width="70%" bgcolor="red"><tr><td>
-
-      There [% IF bug_count > 1 %] 
-        are [% bug_count %] [%+ terms.bugs %] 
-      [% ELSE %]
-        is 1 [% terms.bug %]
-      [% END %]
-      entered for this version!  When you delete this
-      version, <b><blink>ALL</blink></b> stored [% terms.bugs %] will be deleted,
-      too.
-      You could not even see the [% terms.bug %] history for this version anymore!
-      </td></tr></table>
+  outstanding for this version. You must move 
 
+  [% IF bug_count > 1 %]
+     those [% terms.bugs %] 
+  [% ELSE %]
+     that [% terms.bug %]
   [% END %]
+  to another version before you can delete this one.
 
-[% END %]
-
-[% IF bug_count == 0 || Param('allowbugdeletion') %]
+[% ELSE %]
 
   <p>Do you really want to delete this version?<p>
   
diff --git a/template/en/default/admin/versions/deleted.html.tmpl b/template/en/default/admin/versions/deleted.html.tmpl
index f6945ccd3..2ec3ebe10 100644
--- a/template/en/default/admin/versions/deleted.html.tmpl
+++ b/template/en/default/admin/versions/deleted.html.tmpl
@@ -24,8 +24,6 @@
   #
   # product: string; the name of the product the version belonged to
   #
-  # deleted_bug_count: number; the number of bugs which were deleted
-  #                            (if bug deletion is allowed)
   #%]
   
 [% title = BLOCK %]Deleted Version '[% name FILTER html %]' of Product
@@ -34,30 +32,6 @@
   title = title
 %]
 
-<p>
-[% IF deleted_bug_count %]
-  Attachments, [% terms.bug %] activity and dependencies deleted for
-  [%+ deleted_bug_count %]
-  [% IF deleted_bug_count > 1 %] 
-    [%+ terms.bugs %]
-  [% ELSE %]
-    [%+ terms.bug %]
-  [% END %].
-
-  </p><p>
-  [% deleted_bug_count %]
-  [% IF deleted_bug_count > 1 %] 
-    [%+ terms.bugs %]
-  [% ELSE %]
-    [%+ terms.bug %]
-  [% END %]
-  deleted.
-
-[% ELSE %]
-  No [% terms.bugs %] were targetted at the version.
-[% END %]
-</p>
-
 <p>Version '[% name FILTER html %]' deleted.</p>
 
 <p>