diff options
| -rw-r--r-- | Bugzilla/Bug.pm | 28 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 5 |
2 files changed, 26 insertions, 7 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index 4485b620c..c67093d6b 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -1465,8 +1465,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 { @@ -1924,10 +1929,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; } @@ -1950,8 +1960,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; } @@ -2510,9 +2524,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 03c26c5aa..c9448a503 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1722,6 +1722,11 @@ [% title = "Unknown Tab" %] There is no tab named <code>[% current_tab_name FILTER html %]</code>. + [% 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'} %] |