Skip to content

bugzilla
bugzilla
Commit 64be6114 authored by lpsolit%gmail.com's avatar lpsolit%gmail.com
Browse files
Options

Bug 86328: Deleting bugs doesn't delete dependent records properly - Patch by…

Bug 86328: Deleting bugs doesn't delete dependent records properly - Patch by Frederic Buclin <LpSolit@gmail.com> r=wurblzap a=justdave
parent 3541f13e
Show whitespace changes
Inline Side-by-side
Showing with 229 additions and 372 deletions
Bugzilla/Bug.pm
View file @ 64be6114
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
# Bradley Baetz <bbaetz@acm.org> # Bradley Baetz <bbaetz@acm.org>
# Dave Miller <justdave@bugzilla.org> # Dave Miller <justdave@bugzilla.org>
# Max Kanat-Alexander <mkanat@kerio.com> # Max Kanat-Alexander <mkanat@kerio.com>
# Frdric Buclin <LpSolit@gmail.com>
package Bugzilla::Bug; package Bugzilla::Bug;
...@@ -217,6 +218,60 @@ sub initBug { ...@@ -217,6 +218,60 @@ sub initBug {
return $self; return $self;
} }
# This is the correct way to delete bugs from the DB.
# No bug should be deleted from anywhere else except from here.
#
sub remove_from_db {
my ($self) = @_;
my $dbh = Bugzilla->dbh;
if ($self->{'error'}) {
ThrowCodeError("bug_error", { bug => $self });
}
my $bug_id = $self->{'bug_id'};
# tables having 'bugs.bug_id' as a foreign key:
# - attachments
# - bug_group_map
# - bugs
# - bugs_activity
# - cc
# - dependencies
# - duplicates
# - flags
# - keywords
# - longdescs
# - votes
$dbh->bz_lock_tables('attachments WRITE', 'bug_group_map WRITE',
'bugs WRITE', 'bugs_activity WRITE', 'cc WRITE',
'dependencies WRITE', 'duplicates WRITE',
'flags WRITE', 'keywords WRITE',
'longdescs WRITE', 'votes WRITE');
$dbh->do("DELETE FROM bug_group_map WHERE bug_id = ?", undef, $bug_id);
$dbh->do("DELETE FROM bugs_activity WHERE bug_id = ?", undef, $bug_id);
$dbh->do("DELETE FROM cc WHERE bug_id = ?", undef, $bug_id);
$dbh->do("DELETE FROM dependencies WHERE blocked = ? OR dependson = ?",
undef, ($bug_id, $bug_id));
$dbh->do("DELETE FROM duplicates WHERE dupe = ? OR dupe_of = ?",
undef, ($bug_id, $bug_id));
$dbh->do("DELETE FROM flags WHERE bug_id = ?", undef, $bug_id);
$dbh->do("DELETE FROM keywords WHERE bug_id = ?", undef, $bug_id);
$dbh->do("DELETE FROM longdescs WHERE bug_id = ?", undef, $bug_id);
$dbh->do("DELETE FROM votes WHERE bug_id = ?", undef, $bug_id);
# Several of the previous tables also depend on attach_id.
$dbh->do("DELETE FROM attachments WHERE bug_id = ?", undef, $bug_id);
$dbh->do("DELETE FROM bugs WHERE bug_id = ?", undef, $bug_id);
$dbh->bz_unlock_tables();
# Now this bug no longer exists
$self->DESTROY;
return $self;
}
##################################################################### #####################################################################
# Accessors # Accessors
##################################################################### #####################################################################
......
editcomponents.cgi
View file @ 64be6114
...@@ -112,7 +112,8 @@ sub CheckComponent ($$) ...@@ -112,7 +112,8 @@ sub CheckComponent ($$)
# Preliminary checks: # Preliminary checks:
# #
Bugzilla->login(LOGIN_REQUIRED); my $user = Bugzilla->login(LOGIN_REQUIRED);
my $whoid = $user->id;
print Bugzilla->cgi->header(); print Bugzilla->cgi->header();
...@@ -436,57 +437,36 @@ if ($action eq 'del') { ...@@ -436,57 +437,36 @@ if ($action eq 'del') {
# #
if ($action eq 'delete') { if ($action eq 'delete') {
CheckComponent($product, $component); CheckComponent($product, $component);
my $component_id = get_component_id(get_product_id($product),$component); my $component_id = get_component_id(get_product_id($product), $component);
# lock the tables before we start to change everything:
$dbh->bz_lock_tables('attachments WRITE',
'bugs WRITE',
'bugs_activity WRITE',
'components WRITE',
'dependencies WRITE',
'flaginclusions WRITE',
'flagexclusions WRITE');
# According to MySQL doc I cannot do a DELETE x.* FROM x JOIN Y, my $bug_ids =
# so I have to iterate over bugs and delete all the indivial entries $dbh->selectcol_arrayref("SELECT bug_id FROM bugs WHERE component_id = ?",
# in bugs_activies and attachments. undef, $component_id);
my $nb_bugs = scalar(@$bug_ids);
if ($nb_bugs) {
if (Param("allowbugdeletion")) { if (Param("allowbugdeletion")) {
my $deleted_bug_count = 0; foreach my $bug_id (@$bug_ids) {
my $bug = new Bugzilla::Bug($bug_id, $whoid);
SendSQL("SELECT bug_id $bug->remove_from_db();
FROM bugs }
WHERE component_id = $component_id"); }
while (MoreSQLData()) { else {
my $bugid = FetchOneColumn(); ThrowUserError("component_has_bugs", { nb => $nb_bugs });
PushGlobalSQLState();
SendSQL("DELETE FROM attachments WHERE bug_id=$bugid");
SendSQL("DELETE FROM bugs_activity WHERE bug_id=$bugid");
SendSQL("DELETE FROM dependencies WHERE blocked=$bugid");
PopGlobalSQLState();
$deleted_bug_count++;
} }
$vars->{'deleted_bug_count'} = $deleted_bug_count;
# Deleting the rest is easier:
SendSQL("DELETE FROM bugs
WHERE component_id=$component_id");
} }
SendSQL("DELETE FROM flaginclusions $vars->{'deleted_bug_count'} = $nb_bugs;
WHERE component_id=$component_id");
SendSQL("DELETE FROM flagexclusions
WHERE component_id=$component_id");
SendSQL("DELETE FROM components $dbh->bz_lock_tables('components WRITE', 'flaginclusions WRITE',
WHERE id=$component_id"); 'flagexclusions WRITE');
$dbh->do("DELETE FROM flaginclusions WHERE component_id = ?",
undef, $component_id);
$dbh->do("DELETE FROM flagexclusions WHERE component_id = ?",
undef, $component_id);
$dbh->do("DELETE FROM components WHERE id = ?", undef, $component_id);
$dbh->bz_unlock_tables(); $dbh->bz_unlock_tables();
...@@ -494,10 +474,8 @@ if ($action eq 'delete') { ...@@ -494,10 +474,8 @@ if ($action eq 'delete') {
$vars->{'name'} = $component; $vars->{'name'} = $component;
$vars->{'product'} = $product; $vars->{'product'} = $product;
$template->process("admin/components/deleted.html.tmpl", $template->process("admin/components/deleted.html.tmpl", $vars)
$vars)
|| ThrowTemplateError($template->error()); || ThrowTemplateError($template->error());
exit; exit;
} }
......
editmilestones.cgi
View file @ 64be6114
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
# Matt Masson <matthew@zeroknowledge.com> # Matt Masson <matthew@zeroknowledge.com>
# #
# Contributors : Gavin Shelley <bugzilla@chimpychompy.org> # Contributors : Gavin Shelley <bugzilla@chimpychompy.org>
# Frdric Buclin <LpSolit@gmail.com>
# #
...@@ -119,7 +120,8 @@ sub CheckMilestone ($$) ...@@ -119,7 +120,8 @@ sub CheckMilestone ($$)
# Preliminary checks: # Preliminary checks:
# #
Bugzilla->login(LOGIN_REQUIRED); my $user = Bugzilla->login(LOGIN_REQUIRED);
my $whoid = $user->id;
print Bugzilla->cgi->header(); print Bugzilla->cgi->header();
...@@ -304,39 +306,31 @@ if ($action eq 'new') { ...@@ -304,39 +306,31 @@ if ($action eq 'new') {
# #
if ($action eq 'del') { if ($action eq 'del') {
CheckMilestone($product, $milestone); CheckMilestone($product, $milestone);
my $product_id = get_product_id($product); my $product_id = get_product_id($product);
my $dbh = Bugzilla->dbh; my $dbh = Bugzilla->dbh;
my $sth = $dbh->prepare('SELECT count(bug_id), product_id, target_milestone $vars->{'default_milestone'} =
FROM bugs ' . $dbh->selectrow_array('SELECT defaultmilestone
$dbh->sql_group_by('product_id, FROM products WHERE id = ?',
target_milestone') . ' undef, $product_id);
HAVING product_id = ?
AND target_milestone = ?');
trick_taint($milestone); trick_taint($milestone);
$vars->{'bug_count'} = $dbh->selectrow_array($sth, $vars->{'name'} = $milestone;
undef, $vars->{'product'} = $product;
$product_id,
$milestone) || 0;
$sth = $dbh->prepare('SELECT defaultmilestone # The default milestone cannot be deleted.
FROM products if ($vars->{'default_milestone'} eq $milestone) {
WHERE id = ?'); ThrowUserError("milestone_is_default", $vars);
}
$vars->{'default_milestone'} = $dbh->selectrow_array($sth, $vars->{'bug_count'} =
undef, $dbh->selectrow_array("SELECT COUNT(bug_id) FROM bugs
$product_id) || ''; WHERE product_id = ? AND target_milestone = ?",
undef, ($product_id, $milestone)) || 0;
$vars->{'name'} = $milestone; $template->process("admin/milestones/confirm-delete.html.tmpl", $vars)
$vars->{'product'} = $product;
$template->process("admin/milestones/confirm-delete.html.tmpl",
$vars)
|| ThrowTemplateError($template->error()); || ThrowTemplateError($template->error());
exit; exit;
} }
...@@ -347,88 +341,52 @@ if ($action eq 'del') { ...@@ -347,88 +341,52 @@ if ($action eq 'del') {
# #
if ($action eq 'delete') { if ($action eq 'delete') {
CheckMilestone($product, $milestone);
CheckMilestone($product,$milestone);
my $product_id = get_product_id($product); my $product_id = get_product_id($product);
my $dbh = Bugzilla->dbh; my $dbh = Bugzilla->dbh;
# lock the tables before we start to change everything: my $default_milestone =
$dbh->selectrow_array("SELECT defaultmilestone
$dbh->bz_lock_tables('attachments WRITE', FROM products WHERE id = ?",
'bugs WRITE', undef, $product_id);
'bugs_activity WRITE',
'milestones WRITE',
'dependencies WRITE');
# According to MySQL doc I cannot do a DELETE x.* FROM x JOIN Y,
# so I have to iterate over bugs and delete all the indivial entries
# in bugs_activies and attachments.
# Detaint this here, as we may need it if deleting bugs, but will
# definitely need it detainted whhen we actually delete the
# milestone itself
trick_taint($milestone); trick_taint($milestone);
$vars->{'name'} = $milestone;
$vars->{'product'} = $product;
if (Param("allowbugdeletion")) { # The default milestone cannot be deleted.
if ($milestone eq $default_milestone) {
my $deleted_bug_count = 0; ThrowUserError("milestone_is_default", $vars);
my $sth = $dbh->prepare_cached('SELECT bug_id
FROM bugs
WHERE product_id = ?
AND target_milestone = ?');
my $data = $dbh->selectall_arrayref($sth,
undef,
$product_id,
$milestone);
foreach my $aref (@$data) {
my ($bugid) = @$aref;
$dbh->do('DELETE FROM attachments WHERE bug_id = ?',
undef,
$bugid);
$dbh->do('DELETE FROM bugs_activity WHERE bug_id = ?',
undef,
$bugid);
$dbh->do('DELETE FROM dependencies WHERE blocked = ?',
undef,
$bugid);
$deleted_bug_count++;
} }
$vars->{'deleted_bug_count'} = $deleted_bug_count; # We don't want to delete bugs when deleting a milestone.
# Bugs concerned are reassigned to the default milestone.
# Deleting the rest is easier: my $bug_ids =
$dbh->selectcol_arrayref("SELECT bug_id FROM bugs
$dbh->do('DELETE FROM bugs WHERE product_id = ? AND target_milestone = ?",
WHERE product_id = ? undef, ($product_id, $milestone));
AND target_milestone = ?',
undef, my $nb_bugs = scalar(@$bug_ids);
$product_id, if ($nb_bugs) {
$milestone); my $timestamp = $dbh->selectrow_array("SELECT NOW()");
foreach my $bug_id (@$bug_ids) {
$dbh->do("UPDATE bugs SET target_milestone = ?,
delta_ts = ? WHERE bug_id = ?",
undef, ($default_milestone, $timestamp, $bug_id));
# We have to update the 'bugs_activity' table too.
LogActivityEntry($bug_id, 'target_milestone', $milestone,
$default_milestone, $whoid, $timestamp);
}
} }
$dbh->do('DELETE FROM milestones $vars->{'bug_count'} = $nb_bugs;
WHERE product_id = ?
AND value = ?',
undef,
$product_id,
$milestone);
$dbh->bz_unlock_tables(); $dbh->do("DELETE FROM milestones WHERE product_id = ? AND value = ?",
undef, ($product_id, $milestone));
unlink "$datadir/versioncache"; unlink "$datadir/versioncache";
$template->process("admin/milestones/deleted.html.tmpl", $vars)
$vars->{'name'} = $milestone;
$vars->{'product'} = $product;
$template->process("admin/milestones/deleted.html.tmpl",
$vars)
|| ThrowTemplateError($template->error()); || ThrowTemplateError($template->error());
exit; exit;
} }
......
editproducts.cgi
View file @ 64be6114
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
# Dawn Endico <endico@mozilla.org> # Dawn Endico <endico@mozilla.org>
# Joe Robins <jmrobins@tgix.com> # Joe Robins <jmrobins@tgix.com>
# Gavin Shelley <bugzilla@chimpychompy.org> # Gavin Shelley <bugzilla@chimpychompy.org>
# Frdric Buclin <LpSolit@gmail.com>
# #
# Direct any questions on this source code to # Direct any questions on this source code to
# #
...@@ -259,7 +260,8 @@ sub PutTrailer (@) ...@@ -259,7 +260,8 @@ sub PutTrailer (@)
# Preliminary checks: # Preliminary checks:
# #
Bugzilla->login(LOGIN_REQUIRED); my $user = Bugzilla->login(LOGIN_REQUIRED);
my $whoid = $user->id;
print Bugzilla->cgi->header(); print Bugzilla->cgi->header();
...@@ -771,79 +773,55 @@ one."; ...@@ -771,79 +773,55 @@ one.";
# #
if ($action eq 'delete') { if ($action eq 'delete') {
PutHeader("Deleting product");
CheckProduct($product); CheckProduct($product);
my $product_id = get_product_id($product); my $product_id = get_product_id($product);
# lock the tables before we start to change everything: my $bug_ids =
$dbh->selectcol_arrayref("SELECT bug_id FROM bugs WHERE product_id = ?",
$dbh->bz_lock_tables('attachments WRITE', undef, $product_id);
'bugs WRITE',
'bugs_activity WRITE',
'components WRITE',
'dependencies WRITE',
'versions WRITE',
'products WRITE',
'groups WRITE',
'group_control_map WRITE',
'profiles WRITE',
'milestones WRITE',
'flaginclusions WRITE',
'flagexclusions WRITE');
# According to MySQL doc I cannot do a DELETE x.* FROM x JOIN Y,
# so I have to iterate over bugs and delete all the indivial entries
# in bugs_activies and attachments.
my $nb_bugs = scalar(@$bug_ids);
if ($nb_bugs) {
if (Param("allowbugdeletion")) { if (Param("allowbugdeletion")) {
SendSQL("SELECT bug_id foreach my $bug_id (@$bug_ids) {
FROM bugs my $bug = new Bugzilla::Bug($bug_id, $whoid);
WHERE product_id=$product_id"); $bug->remove_from_db();
while (MoreSQLData()) { }
my $bugid = FetchOneColumn(); }
else {
PushGlobalSQLState(); ThrowUserError("product_has_bugs", { nb => $nb_bugs });
SendSQL("DELETE FROM attachments WHERE bug_id=$bugid"); }
SendSQL("DELETE FROM bugs_activity WHERE bug_id=$bugid");
SendSQL("DELETE FROM dependencies WHERE blocked=$bugid");
PopGlobalSQLState();
} }
print "Attachments, bug activity and dependencies deleted.<BR>\n";
# Deleting the rest is easier: PutHeader("Deleting product");
print "All references to deleted bugs removed.<P>\n" if $nb_bugs;
SendSQL("DELETE FROM bugs $dbh->bz_lock_tables('products WRITE', 'components WRITE',
WHERE product_id=$product_id"); 'versions WRITE', 'milestones WRITE',
print "Bugs deleted.<BR>\n"; 'group_control_map WRITE',
} 'flaginclusions WRITE', 'flagexclusions WRITE');
SendSQL("DELETE FROM components $dbh->do("DELETE FROM components WHERE product_id = ?", undef, $product_id);
WHERE product_id=$product_id");
print "Components deleted.<BR>\n"; print "Components deleted.<BR>\n";
SendSQL("DELETE FROM versions $dbh->do("DELETE FROM versions WHERE product_id = ?", undef, $product_id);
WHERE product_id=$product_id"); print "Versions deleted.<BR>\n";
print "Versions deleted.<P>\n";
# deleting associated target milestones - matthew@zeroknowledge.com $dbh->do("DELETE FROM milestones WHERE product_id = ?", undef, $product_id);
SendSQL("DELETE FROM milestones print "Milestones deleted.<P>\n";
WHERE product_id=$product_id");
print "Milestones deleted.<BR>\n";
SendSQL("DELETE FROM group_control_map $dbh->do("DELETE FROM group_control_map WHERE product_id = ?",
WHERE product_id=$product_id"); undef, $product_id);
print "Group controls deleted.<BR>\n"; print "Group controls deleted.<BR>\n";
SendSQL("DELETE FROM flaginclusions $dbh->do("DELETE FROM flaginclusions WHERE product_id = ?",
WHERE product_id=$product_id"); undef, $product_id);
SendSQL("DELETE FROM flagexclusions $dbh->do("DELETE FROM flagexclusions WHERE product_id = ?",
WHERE product_id=$product_id"); undef, $product_id);
print "Flag inclusions and exclusions deleted.<BR>\n"; print "Flag inclusions and exclusions deleted.<P>\n";
SendSQL("DELETE FROM products $dbh->do("DELETE FROM products WHERE id = ?", undef, $product_id);
WHERE id=$product_id"); print "Product '$product' deleted.<P>\n";
print "Product '$product' deleted.<BR>\n";
$dbh->bz_unlock_tables(); $dbh->bz_unlock_tables();
......
editversions.cgi
View file @ 64be6114
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
# Contributor(s): Holger Schurig <holgerschurig@nikocity.de> # Contributor(s): Holger Schurig <holgerschurig@nikocity.de>
# Terry Weissman <terry@mozilla.org> # Terry Weissman <terry@mozilla.org>
# Gavin Shelley <bugzilla@chimpychompy.org> # Gavin Shelley <bugzilla@chimpychompy.org>
# Frdric Buclin <LpSolit@gmail.com>
# #
# #
# Direct any questions on this source code to # Direct any questions on this source code to
...@@ -293,66 +294,32 @@ if ($action eq 'del') { ...@@ -293,66 +294,32 @@ if ($action eq 'del') {
# #
if ($action eq 'delete') { if ($action eq 'delete') {
CheckVersion($product, $version);
CheckVersion($product,$version);
my $product_id = get_product_id($product); my $product_id = get_product_id($product);
# lock the tables before we start to change everything: trick_taint($version);
$dbh->bz_lock_tables('attachments WRITE',
'bugs WRITE',
'bugs_activity WRITE',
'versions WRITE',
'dependencies WRITE');
# According to MySQL doc I cannot do a DELETE x.* FROM x JOIN Y,
# so I have to iterate over bugs and delete all the indivial entries
# in bugs_activies and attachments.
if (Param("allowbugdeletion")) {
my $deleted_bug_count = 0; my $nb_bugs =
$dbh->selectrow_array("SELECT COUNT(bug_id) FROM bugs
WHERE product_id = ? AND version = ?",
undef, ($product_id, $version));
SendSQL("SELECT bug_id # The version cannot be removed if there are bugs
FROM bugs # associated with it.
WHERE product_id = $product_id if ($nb_bugs) {
AND version = " . SqlQuote($version)); ThrowUserError("version_has_bugs", { nb => $nb_bugs });
while (MoreSQLData()) {
my $bugid = FetchOneColumn();
PushGlobalSQLState();
SendSQL("DELETE FROM attachments WHERE bug_id = $bugid");
SendSQL("DELETE FROM bugs_activity WHERE bug_id = $bugid");
SendSQL("DELETE FROM dependencies WHERE blocked = $bugid");
PopGlobalSQLState();
$deleted_bug_count++;
} }
$vars->{'deleted_bug_count'} = $deleted_bug_count; $dbh->do("DELETE FROM versions WHERE product_id = ? AND value = ?",
undef, ($product_id, $version));
# Deleting the rest is easier:
SendSQL("DELETE FROM bugs
WHERE product_id = $product_id
AND version = " . SqlQuote($version));
}
SendSQL("DELETE FROM versions
WHERE product_id = $product_id
AND value = " . SqlQuote($version));
$dbh->bz_unlock_tables();
unlink "$datadir/versioncache"; unlink "$datadir/versioncache";
$vars->{'name'} = $version; $vars->{'name'} = $version;
$vars->{'product'} = $product; $vars->{'product'} = $product;
$template->process("admin/versions/deleted.html.tmpl",
$vars)
|| ThrowTemplateError($template->error());
$template->process("admin/versions/deleted.html.tmpl", $vars)
|| ThrowTemplateError($template->error());
exit; exit;
} }
......
template/en/default/admin/components/deleted.html.tmpl
View file @ 64be6114
...@@ -36,23 +36,15 @@ ...@@ -36,23 +36,15 @@
<p> <p>
[% IF deleted_bug_count %] [% IF deleted_bug_count %]
Attachments, [% terms.bug %] activity and dependencies deleted for
[%+ deleted_bug_count %]
[%- IF deleted_bug_count %]
[% terms.bugs %]
[% ELSE %]
[% terms.bug %]
[% END %].
</p><p>
[% deleted_bug_count %] [% deleted_bug_count %]
[%- IF deleted_bug_count %] [%- IF deleted_bug_count > 1 %]
[% terms.bugs %] [% terms.bugs %]
[% ELSE %] [% ELSE %]
[% terms.bug %] [% terms.bug %]
[% END %] [% END %]
deleted. deleted.
</p><p>
All references to those deleted [% terms.bugs %] have been removed.
[% ELSE %] [% ELSE %]
No [% terms.bugs %] existed for the component. No [% terms.bugs %] existed for the component.
[% END %] [% END %]
......
template/en/default/admin/milestones/confirm-delete.html.tmpl
View file @ 64be6114
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
# Rights Reserved. # Rights Reserved.
# #
# Contributor(s): Gavin Shelley <bugzilla@chimpychompy.org> # Contributor(s): Gavin Shelley <bugzilla@chimpychompy.org>
# Frédéric Buclin <LpSolit@gmail.com>
#%] #%]
[%# INTERFACE: [%# INTERFACE:
...@@ -69,66 +70,30 @@ ...@@ -69,66 +70,30 @@
[% IF bug_count %] [% IF bug_count %]
[% IF !Param("allowbugdeletion") %] <table border="0" cellpadding="20" width="70%" bgcolor="red">
<tr><td>
Sorry, there There
[% IF bug_count > 1 %] [% IF bug_count > 1 %]
are [% bug_count %] [%+ terms.bugs %] are [% bug_count %] [%+ terms.bugs %]
[% ELSE %] [% ELSE %]
is [% bug_count %] [%+ terms.bug %]
[% END %]
outstanding for this milestone. You must move
[% IF bug_count > 1 %]
those [% terms.bugs %]
[% ELSE %]
that [% terms.bug %]
[% END %]
to another milestone before you can delete this one.
[% ELSE %]
<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 %] is 1 [% terms.bug %]
[% END %] [% END %]
entered for this milestone! When you delete this entered for this milestone! When you delete this milestone,
milestone, <b><blink>ALL</blink></b> stored [% terms.bugs %] will be deleted, <b><blink>ALL</blink></b> stored [% terms.bugs %] will be reassigned to
too. the default milestone of this product.
You could not even see the [% terms.bug %] history for this milestone anymore! </td></tr>
</td></tr></table> </table>
[% END %]
[% END %] [% END %]
[% IF default_milestone == name %] <p>Do you really want to delete this milestone?<p>
<p>Sorry, but '[% name FILTER html %]' is the default milestone for product '
[%- product FILTER html %]', and so it can not be deleted.
[% ELSE %]
[% IF bug_count == 0 || Param('allowbugdeletion') %] <form method="post" action="editmilestones.cgi">
<p>Do you really want to delete this milestone?<p>
<form method="post" action="editmilestones.cgi">
<input type="submit" value="Yes, delete"> <input type="submit" value="Yes, delete">
<input type="hidden" name="action" value="delete"> <input type="hidden" name="action" value="delete">
<input type="hidden" name="product" value="[% product FILTER html %]"> <input type="hidden" name="product" value="[% product FILTER html %]">
<input type="hidden" name="milestone" value="[% name FILTER html %]"> <input type="hidden" name="milestone" value="[% name FILTER html %]">
</form> </form>
[% END %]
[% END %]
[% PROCESS admin/milestones/footer.html.tmpl %] [% PROCESS admin/milestones/footer.html.tmpl %]
......
template/en/default/admin/milestones/deleted.html.tmpl
View file @ 64be6114
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
# Rights Reserved. # Rights Reserved.
# #
# Contributor(s): Gavin Shelley <bugzilla@chimpychompy.org> # Contributor(s): Gavin Shelley <bugzilla@chimpychompy.org>
# Frédéric Buclin <LpSolit@gmail.com>
#%] #%]
[%# INTERFACE: [%# INTERFACE:
...@@ -24,8 +25,8 @@ ...@@ -24,8 +25,8 @@
# #
# product: string; the name of the product the milestone belonged to # product: string; the name of the product the milestone belonged to
# #
# deleted_bug_count: number; the number of bugs which were deleted # bug_count: number; the number of bugs which were reassigned to
# (if bug deletion is allowed) # the default milestone.
#%] #%]
[% title = BLOCK %]Deleted Milestone '[% name FILTER html %]' of Product [% title = BLOCK %]Deleted Milestone '[% name FILTER html %]' of Product
...@@ -35,23 +36,15 @@ ...@@ -35,23 +36,15 @@
%] %]
<p> <p>
[% IF deleted_bug_count %] [% IF 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> [% bug_count %]
[% deleted_bug_count %] [% IF bug_count > 1 %]
[% IF deleted_bug_count > 1 %]
[%+ terms.bugs %] [%+ terms.bugs %]
[% ELSE %] [% ELSE %]
[%+ terms.bug %] [%+ terms.bug %]
[% END %] [% END %]
deleted. reassigned to the default milestone.
[% ELSE %] [% ELSE %]
No [% terms.bugs %] were targetted at the milestone. No [% terms.bugs %] were targetted at the milestone.
......
template/en/default/admin/versions/confirm-delete.html.tmpl
View file @ 64be6114
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
# Rights Reserved. # Rights Reserved.
# #
# Contributor(s): Gavin Shelley <bugzilla@chimpychompy.org> # Contributor(s): Gavin Shelley <bugzilla@chimpychompy.org>
# Frédéric Buclin <LpSolit@gmail.com>
#%] #%]
[%# INTERFACE: [%# INTERFACE:
...@@ -67,10 +68,7 @@ ...@@ -67,10 +68,7 @@
[% IF bug_count %] [% IF bug_count %]
[% IF !Param("allowbugdeletion") %]
Sorry, there Sorry, there
[% IF bug_count > 1 %] [% IF bug_count > 1 %]
are [% bug_count %] [%+ terms.bugs %] are [% bug_count %] [%+ terms.bugs %]
[% ELSE %] [% ELSE %]
...@@ -84,29 +82,9 @@ ...@@ -84,29 +82,9 @@
[% ELSE %] [% ELSE %]
that [% terms.bug %] that [% terms.bug %]
[% END %] [% END %]
to another version before you can delete this one. to another version before you can delete this one.
[% ELSE %] [% ELSE %]
<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>
[% END %]
[% END %]
[% IF bug_count == 0 || Param('allowbugdeletion') %]
<p>Do you really want to delete this version?<p> <p>Do you really want to delete this version?<p>
......
template/en/default/admin/versions/deleted.html.tmpl
View file @ 64be6114
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
# #
# product: string; the name of the product the version belonged to # 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 [% title = BLOCK %]Deleted Version '[% name FILTER html %]' of Product
...@@ -34,30 +32,6 @@ ...@@ -34,30 +32,6 @@
title = title 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>Version '[% name FILTER html %]' deleted.</p>
<p> <p>
......
template/en/default/filterexceptions.pl
View file @ 64be6114
...@@ -624,17 +624,13 @@ ...@@ -624,17 +624,13 @@
], ],
'admin/milestones/deleted.html.tmpl' => [ 'admin/milestones/deleted.html.tmpl' => [
'deleted_bug_count' 'bug_count'
], ],
'admin/versions/confirm-delete.html.tmpl' => [ 'admin/versions/confirm-delete.html.tmpl' => [
'bug_count' 'bug_count'
], ],
'admin/versions/deleted.html.tmpl' => [
'deleted_bug_count'
],
'admin/settings/edit.html.tmpl' => [ 'admin/settings/edit.html.tmpl' => [
'name', 'name',
'checkbox_name' 'checkbox_name'
......
template/en/default/global/user-error.html.tmpl
View file @ 64be6114
...@@ -249,6 +249,12 @@ ...@@ -249,6 +249,12 @@
[% title = "Blank Component Name Not Allowed" %] [% title = "Blank Component Name Not Allowed" %]
You must enter a name for this new component. You must enter a name for this new component.
[% ELSIF error == "component_has_bugs" %]
[% title = BLOCK %]Component has [% terms.Bugs %][% END %]
There are [% nb FILTER html %] [%+ terms.bugs %] entered for this component!
You must reassign those [% terms.bugs %] to another component before you
can delete this one.
[% ELSIF error == "component_must_have_a_name" %] [% ELSIF error == "component_must_have_a_name" %]
[% title = "Blank Component Name Not Allowed" %] [% title = "Blank Component Name Not Allowed" %]
You cannot delete the component name for component '[% name FILTER html %]'. You cannot delete the component name for component '[% name FILTER html %]'.
...@@ -683,6 +689,11 @@ ...@@ -683,6 +689,11 @@
[% title = "Blank Milestone Name Not Allowed" %] [% title = "Blank Milestone Name Not Allowed" %]
You must enter a name for this milestone. You must enter a name for this milestone.
[% ELSIF error == "milestone_is_default" %]
[% title = "Default milestone not deletable" %]
Sorry, but [% name FILTER html %] is the default milestone for
product '[% product FILTER html %]', and so it can not be deleted.
[% ELSIF error == "milestone_name_too_long" %] [% ELSIF error == "milestone_name_too_long" %]
[% title = "Milestone Name Is Too Long" %] [% title = "Milestone Name Is Too Long" %]
The name of a milestone is limited to 20 characters. The name of a milestone is limited to 20 characters.
...@@ -911,6 +922,12 @@ ...@@ -911,6 +922,12 @@
You are not permitted to edit [% terms.bugs %] in product You are not permitted to edit [% terms.bugs %] in product
[% product FILTER html %]. [% product FILTER html %].
[% ELSIF error == "product_has_bugs" %]
[% title = BLOCK %]Product has [% terms.Bugs %][% END %]
There are [% nb FILTER html %] [%+ terms.bugs %] entered for this product!
You must reassign those [% terms.bugs %] to another product before you
can delete this one.
[% ELSIF error == "query_name_missing" %] [% ELSIF error == "query_name_missing" %]
[% title = "No Search Name Specified" %] [% title = "No Search Name Specified" %]
You must enter a name for your search. You must enter a name for your search.
...@@ -1026,6 +1043,12 @@ ...@@ -1026,6 +1043,12 @@
[% title = "Blank Version Name Not Allowed" %] [% title = "Blank Version Name Not Allowed" %]
You must enter a name for this version. You must enter a name for this version.
[% ELSIF error == "version_has_bugs" %]
[% title = BLOCK %]Version has [% terms.Bugs %][% END %]
There are [% nb FILTER html %] [%+ terms.bugs %] associated with this
version! You must reassign those [% terms.bugs %] to another version
before you can delete this one.
[% ELSIF error == "version_name_too_long" %] [% ELSIF error == "version_name_too_long" %]
[% title = "Version Name Is Too Long" %] [% title = "Version Name Is Too Long" %]
The name of a version is limited to 20 characters. The name of a version is limited to 20 characters.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment