summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2013-01-17 17:29:07 +0100
committerDave Lawrence <dlawrence@mozilla.com>2013-01-17 17:29:07 +0100
commit9035629755f4c20b7e8c974efd696f09aae981c8 (patch)
tree7eec05597c148a4d47f1533881acdbc148a3f41b
parentf4fc2d24552273b713123dc7084bc01d595db119 (diff)
downloadbugzilla-9035629755f4c20b7e8c974efd696f09aae981c8.tar.gz
bugzilla-9035629755f4c20b7e8c974efd696f09aae981c8.tar.xz
Bug 752946 - Moving a bug into another product lists inactive components, milestones and versions
r/a=LpSolit
-rw-r--r--Bugzilla/Bug.pm28
-rw-r--r--template/en/default/global/user-error.html.tmpl5
2 files changed, 26 insertions, 7 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index e47b05779..f694d0621 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -1462,8 +1462,13 @@ sub _check_component {
$name || ThrowUserError("require_component");
my $product = blessed($invocant) ? $invocant->product_obj
: $params->{product};
- my $obj = Bugzilla::Component->check({ product => $product, name => $name });
- return $obj;
+ my $old_comp = blessed($invocant) ? $invocant->component
+ : $params->{component};
+ my $object = Bugzilla::Component->check({ product => $product, name => $name });
+ if ($object->name ne $old_comp && !$object->is_active) {
+ ThrowUserError('value_inactive', { class => ref($object), value => $name });
+ }
+ return $object;
}
sub _check_creation_ts {
@@ -1905,10 +1910,15 @@ sub _check_target_milestone {
my ($invocant, $target, undef, $params) = @_;
my $product = blessed($invocant) ? $invocant->product_obj
: $params->{product};
+ my $old_target = blessed($invocant) ? $invocant->target_milestone
+ : $params->{target_milestone};
$target = trim($target);
$target = $product->default_milestone if !defined $target;
my $object = Bugzilla::Milestone->check(
{ product => $product, name => $target });
+ if ($object->name ne $old_target && !$object->is_active) {
+ ThrowUserError('value_inactive', { class => ref($object), value => $target });
+ }
return $object->name;
}
@@ -1931,8 +1941,12 @@ sub _check_version {
$version = trim($version);
my $product = blessed($invocant) ? $invocant->product_obj
: $params->{product};
- my $object =
- Bugzilla::Version->check({ product => $product, name => $version });
+ my $old_vers = blessed($invocant) ? $invocant->version
+ : $params->{version};
+ my $object = Bugzilla::Version->check({ product => $product, name => $version });
+ if ($object->name ne $old_vers && !$object->is_active) {
+ ThrowUserError('value_inactive', { class => ref($object), value => $version });
+ }
return $object->name;
}
@@ -2467,9 +2481,9 @@ sub _set_product {
milestone => $milestone_ok ? $self->target_milestone
: $product->default_milestone
};
- $vars{components} = [map { $_->name } @{$product->components}];
- $vars{milestones} = [map { $_->name } @{$product->milestones}];
- $vars{versions} = [map { $_->name } @{$product->versions}];
+ $vars{components} = [map { $_->name } grep($_->is_active, @{$product->components})];
+ $vars{milestones} = [map { $_->name } grep($_->is_active, @{$product->milestones})];
+ $vars{versions} = [map { $_->name } grep($_->is_active, @{$product->versions})];
}
if (!$verified) {
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 4269d693d..2341cd58f 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1639,6 +1639,11 @@
[% title = "Unknown Tab" %]
<code>[% current_tab_name FILTER html %]</code> is not a legal tab name.
+ [% ELSIF error == "value_inactive" %]
+ [% title = "Value is Not Active" %]
+ [% type = BLOCK %][% INCLUDE object_name class = class %][% END %]
+ The [% type FILTER html %] value '[% value FILTER html %]' is not active.
+
[% ELSIF error == "version_already_exists" %]
[% title = "Version Already Exists" %]
[% admindocslinks = {'versions.html' => 'Administering versions'} %]