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

2 files changed, 15 insertions, 11 deletions

diff --git a/Bugzilla/Config/Common.pm b/Bugzilla/Config/Common.pm
index cbb030a9c..8b1a9da91 100644
--- a/Bugzilla/Config/Common.pm
+++ b/Bugzilla/Config/Common.pm
@@ -30,6 +30,7 @@ use base qw(Exporter);
     check_bug_status check_smtp_auth check_theschwartz_available
     check_maxattachmentsize check_email
     check_comment_taggers_group
+    get_all_group_names
 );
 
 # Checking functions for the various values
@@ -345,6 +346,13 @@ sub check_comment_taggers_group {
     return check_group($group_name);
 }
 
+sub get_all_group_names {
+    return [
+        '',
+        map { $_->name } Bugzilla::Group->get_all,
+    ];
+}
+
 # OK, here are the parameter definitions themselves.
 #
 # Each definition is a hash with keys:
diff --git a/Bugzilla/Config/GroupSecurity.pm b/Bugzilla/Config/GroupSecurity.pm
index c9d6421d3..68c852fe6 100644
--- a/Bugzilla/Config/GroupSecurity.pm
+++ b/Bugzilla/Config/GroupSecurity.pm
@@ -29,7 +29,7 @@ sub get_param_list {
         {
             name    => 'chartgroup',
             type    => 's',
-            choices => \&_get_all_group_names,
+            choices => \&get_all_group_names,
             default => 'editbugs',
             checker => \&check_group
         },
@@ -37,7 +37,7 @@ sub get_param_list {
         {
             name    => 'insidergroup',
             type    => 's',
-            choices => \&_get_all_group_names,
+            choices => \&get_all_group_names,
             default => '',
             checker => \&check_group
         },
@@ -45,7 +45,7 @@ sub get_param_list {
         {
             name    => 'timetrackinggroup',
             type    => 's',
-            choices => \&_get_all_group_names,
+            choices => \&get_all_group_names,
             default => 'editbugs',
             checker => \&check_group
         },
@@ -53,7 +53,7 @@ sub get_param_list {
         {
             name    => 'querysharegroup',
             type    => 's',
-            choices => \&_get_all_group_names,
+            choices => \&get_all_group_names,
             default => 'editbugs',
             checker => \&check_group
         },
@@ -61,7 +61,7 @@ sub get_param_list {
         {
             name    => 'comment_taggers_group',
             type    => 's',
-            choices => \&_get_all_group_names,
+            choices => \&get_all_group_names,
             default => 'editbugs',
             checker => \&check_comment_taggers_group
         },
@@ -69,7 +69,7 @@ sub get_param_list {
         {
             name    => 'debug_group',
             type    => 's',
-            choices => \&_get_all_group_names,
+            choices => \&get_all_group_names,
             default => 'admin',
             checker => \&check_group
         },
@@ -89,10 +89,6 @@ 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;