diff options
author | Dylan William Hardison <dylan@mozilla.com> | 2015-05-19 05:48:57 +0200 |
---|---|---|
committer | Byron Jones <glob@mozilla.com> | 2015-05-19 05:48:57 +0200 |
commit | 64fd94e3c85af86131f34694a188aca380462f99 (patch) | |
tree | a97a8168b2bef327e9d0a005b0d5493d159d7ac5 /Bugzilla/Bug.pm | |
parent | 1e23e69630c37096d05e9a3ef31e824e912987d3 (diff) | |
download | bugzilla-64fd94e3c85af86131f34694a188aca380462f99.tar.gz bugzilla-64fd94e3c85af86131f34694a188aca380462f99.tar.xz |
Bug 1160430: Backport bug 69267 to BMO (Add the ability to deactivate keywords)
Diffstat (limited to 'Bugzilla/Bug.pm')
-rw-r--r-- | Bugzilla/Bug.pm | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index eee35360b..d22ebc1ce 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -1894,6 +1894,19 @@ sub _check_keywords { my $obj = Bugzilla::Keyword->check($keyword); $keywords{$obj->id} = $obj; } + + my %old_kw_id; + if (blessed $invocant) { + my @old_keywords = @{$invocant->keyword_objects}; + %old_kw_id = map { $_->id => 1 } @old_keywords; + } + + foreach my $keyword (values %keywords) { + next if $keyword->is_active || exists $old_kw_id{$keyword->id}; + ThrowUserError('value_inactive', + { value => $keyword->name, class => ref $keyword }); + } + return [values %keywords]; } |