From: Matt Selsky <selsky@columbia.edu>
Date: Tue, 25 Nov 2014 10:31:18 +0000 (+0000)
Subject: Bug 317021 - improve description of bz_canusewhine* parameters. r=gerv.
X-Git-Tag: release-5.1.1~441
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=649a38910889a9945e2ef22f5d6ff4d32fceeba6;p=thirdparty%2Fbugzilla.git

Bug 317021 - improve description of bz_canusewhine* parameters. r=gerv.
---

diff --git a/Bugzilla/Install.pm b/Bugzilla/Install.pm
index 5a2266e36f..d02c43d2fd 100644
--- a/Bugzilla/Install.pm
+++ b/Bugzilla/Install.pm
@@ -135,11 +135,13 @@ use constant SYSTEM_GROUPS => (
     },
     {
         name         => 'bz_canusewhineatothers',
-        description  => 'Can configure whine reports for other users',
+        description  => 'Can configure queries and schedules for periodic'
+            . ' reports to be run and sent via email to other users and groups',
     },
     {
         name         => 'bz_canusewhines',
-        description  => 'User can configure whine reports for self',
+        description  => 'Can configure queries and schedules for periodic'
+            . ' reports to be run and sent via email to themselves',
         # inherited_by means that users in the groups listed below are
         # automatically members of bz_canusewhines.
         inherited_by => ['editbugs', 'bz_canusewhineatothers'],
@@ -217,8 +219,8 @@ sub update_system_groups {
 
     # Create most of the system groups
     foreach my $definition (SYSTEM_GROUPS) {
-        my $exists = new Bugzilla::Group({ name => $definition->{name} });
-        if (!$exists) {
+        my $group = new Bugzilla::Group({ name => $definition->{name} });
+        if (!$group) {
             $definition->{isbuggroup} = 0;
             $definition->{silently} = !$editbugs_exists;
             my $inherited_by = delete $definition->{inherited_by};
@@ -234,6 +236,10 @@ sub update_system_groups {
                 }
             }
         }
+        elsif ($group->description ne $definition->{description}) {
+            $group->set_description($definition->{description});
+            $group->update();
+        }
     }
 
     $dbh->bz_commit_transaction();