summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2017-09-07 17:04:07 +0200
committerGitHub <noreply@github.com>2017-09-07 17:04:07 +0200
commit946e9116c2a2a4ccbc44f657827087bf44ba295a (patch)
treec110b20d0f189946915d737180f78e835c27e9b1 /extensions
parent8feb55f32ccd688d2b51105f4d56985abf0baa93 (diff)
downloadbugzilla-946e9116c2a2a4ccbc44f657827087bf44ba295a.tar.gz
bugzilla-946e9116c2a2a4ccbc44f657827087bf44ba295a.tar.xz
Bug 1397747 - Move _get_all_group_names to Bugzilla::Config::Common::_get_all_group_names, and remove copy-pasted code
Diffstat (limited to 'extensions')
-rw-r--r--extensions/AntiSpam/lib/Config.pm8
-rw-r--r--extensions/BMO/Extension.pm4
-rw-r--r--extensions/EditComments/Extension.pm2
-rw-r--r--extensions/RestrictComments/lib/Config.pm10
4 files changed, 6 insertions, 18 deletions
diff --git a/extensions/AntiSpam/lib/Config.pm b/extensions/AntiSpam/lib/Config.pm
index b6d1234d9..e35a7f001 100644
--- a/extensions/AntiSpam/lib/Config.pm
+++ b/extensions/AntiSpam/lib/Config.pm
@@ -23,7 +23,7 @@ sub get_param_list {
{
name => 'antispam_spammer_exclude_group',
type => 's',
- choices => \&_get_all_group_names,
+ choices => \&get_all_group_names,
default => 'canconfirm',
checker => \&check_group
},
@@ -79,10 +79,4 @@ sub get_param_list {
return @param_list;
}
-sub _get_all_group_names {
- my @group_names = map {$_->name} Bugzilla::Group->get_all;
- unshift(@group_names, '');
- return \@group_names;
-}
-
1;
diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm
index cb1996cbc..db672f82a 100644
--- a/extensions/BMO/Extension.pm
+++ b/extensions/BMO/Extension.pm
@@ -31,7 +31,7 @@ use base qw(Bugzilla::Extension);
use Bugzilla::Bug;
use Bugzilla::BugMail;
-use Bugzilla::Config::Common qw(check_group);
+use Bugzilla::Config::Common qw(check_group get_all_group_names);
use Bugzilla::Constants;
use Bugzilla::Error;
use Bugzilla::Field;
@@ -2579,7 +2579,7 @@ sub config_modify_panels {
push @{ $args->{panels}->{groupsecurity}->{params} }, {
name => 'delete_comments_group',
type => 's',
- choices => \&Bugzilla::Config::GroupSecurity::_get_all_group_names,
+ choices => \&get_all_group_names,
default => 'admin',
checker => \&check_group
};
diff --git a/extensions/EditComments/Extension.pm b/extensions/EditComments/Extension.pm
index 1dc22a85e..ab19ab6e7 100644
--- a/extensions/EditComments/Extension.pm
+++ b/extensions/EditComments/Extension.pm
@@ -249,7 +249,7 @@ sub config_modify_panels {
push @{ $args->{panels}->{groupsecurity}->{params} }, {
name => 'edit_comments_group',
type => 's',
- choices => \&Bugzilla::Config::GroupSecurity::_get_all_group_names,
+ choices => \&get_all_group_names,
default => 'admin',
checker => \&check_group
};
diff --git a/extensions/RestrictComments/lib/Config.pm b/extensions/RestrictComments/lib/Config.pm
index 55cf11187..e5dbc518c 100644
--- a/extensions/RestrictComments/lib/Config.pm
+++ b/extensions/RestrictComments/lib/Config.pm
@@ -23,14 +23,14 @@ sub get_param_list {
{
name => 'restrict_comments_group',
type => 's',
- choices => \&_get_all_group_names,
+ choices => \&get_all_group_names,
default => '',
checker => \&check_group
},
{
name => 'restrict_comments_enable_group',
type => 's',
- choices => \&_get_all_group_names,
+ choices => \&get_all_group_names,
default => '',
checker => \&check_group
},
@@ -39,10 +39,4 @@ sub get_param_list {
return @param_list;
}
-sub _get_all_group_names {
- my @group_names = map {$_->name} Bugzilla::Group->get_all;
- unshift(@group_names, '');
- return \@group_names;
-}
-
1;