Bug 1397747 - Move _get_all_group_names to Bugzilla::Config::Common::_get_all_group_names, and remove copy-pasted code

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;