From 87fbd3d0ca62ee48627f8cd91a3ed8c4edc5a44c Mon Sep 17 00:00:00 2001 From: "bzrmirror%bugzilla.org" Date: Tue, 25 Nov 2014 10:45:51 +0000 Subject: [PATCH] Revert "Bug 317021 - improve description of bz_canusewhine* parameters. r=gerv." Old version of patch committed by mistake. This reverts commit 88e4ee5b99ef75a149f8d39bd2b92ccac3e5743b. git-svn-id: svn://10.0.0.236/trunk@265689 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webtools/bugzilla/.bzrrev | 2 +- mozilla/webtools/bugzilla/.gitrev | 2 +- mozilla/webtools/bugzilla/Bugzilla/Install.pm | 6 ++---- mozilla/webtools/bugzilla/Bugzilla/Install/DB.pm | 11 ----------- 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev index 83828a5281a..198f2b04060 100644 --- a/mozilla/webtools/bugzilla/.bzrrev +++ b/mozilla/webtools/bugzilla/.bzrrev @@ -1 +1 @@ -9222 \ No newline at end of file +9223 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev index 00d9a49fbc7..adefb454d5b 100644 --- a/mozilla/webtools/bugzilla/.gitrev +++ b/mozilla/webtools/bugzilla/.gitrev @@ -1 +1 @@ -88e4ee5b99ef75a149f8d39bd2b92ccac3e5743b \ No newline at end of file +977de764485c48c16c4b34e73ab2f1d08506b0a7 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/Bugzilla/Install.pm b/mozilla/webtools/bugzilla/Bugzilla/Install.pm index 8d07eecc367..5a2266e36fb 100644 --- a/mozilla/webtools/bugzilla/Bugzilla/Install.pm +++ b/mozilla/webtools/bugzilla/Bugzilla/Install.pm @@ -135,13 +135,11 @@ use constant SYSTEM_GROUPS => ( }, { name => 'bz_canusewhineatothers', - description => 'Can configure queries and schedules for periodic' - . ' reports to be run and sent via email to other users and groups', + description => 'Can configure whine reports for other users', }, { name => 'bz_canusewhines', - description => 'Can configure queries and schedules for periodic' - . ' reports to be run and sent via email to themselves', + description => 'User can configure whine reports for self', # inherited_by means that users in the groups listed below are # automatically members of bz_canusewhines. inherited_by => ['editbugs', 'bz_canusewhineatothers'], diff --git a/mozilla/webtools/bugzilla/Bugzilla/Install/DB.pm b/mozilla/webtools/bugzilla/Bugzilla/Install/DB.pm index 540845fb21e..ab02fe41db3 100644 --- a/mozilla/webtools/bugzilla/Bugzilla/Install/DB.pm +++ b/mozilla/webtools/bugzilla/Bugzilla/Install/DB.pm @@ -730,17 +730,6 @@ sub update_table_definitions { $dbh->bz_add_column('longdescs', 'is_markdown', {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'}); - $dbh->do('UPDATE groups SET description = ? WHERE name = ? and description = ?', - undef, - "Can configure queries and schedules for periodic reports to be run and sent via email to other users and groups", - "bz_canusewhineatothers", - "Can configure whine reports for other users"); - $dbh->do('UPDATE groups SET description = ? WHERE name = ? and description = ?', - undef, - "Can configure queries and schedules for periodic reports to be run and sent via email to themselves", - "bz_canusewhines", - "User can configure whine reports for self"); - ################################################################ # New --TABLE-- changes should go *** A B O V E *** this point # ################################################################