diff options
| -rw-r--r-- | Bugzilla/DB.pm | 8 | ||||
| -rwxr-xr-x | checksetup.pl | 25 |
2 files changed, 23 insertions, 10 deletions
diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm index 8ef05e12e..e4aa779b8 100644 --- a/Bugzilla/DB.pm +++ b/Bugzilla/DB.pm @@ -218,14 +218,14 @@ sub bz_get_field_defs { my $extra = ""; if (!&::UserInGroup(Param('timetrackinggroup'))) { - $extra = "WHERE name NOT IN ('estimated time', 'remaining_time', " . + $extra = "AND name NOT IN ('estimated_time', 'remaining_time', " . "'work_time', 'percentage_complete', 'deadline')"; } my @fields; - my $sth = $self->prepare("SELECT name, description - FROM fielddefs $extra - ORDER BY sortkey"); + my $sth = $self->prepare("SELECT name, description FROM fielddefs + WHERE obsolete = 0 $extra + ORDER BY sortkey"); $sth->execute(); while (my $field_ref = $sth->fetchrow_hashref()) { push(@fields, $field_ref); diff --git a/checksetup.pl b/checksetup.pl index 36c11c5dd..b42907495 100755 --- a/checksetup.pl +++ b/checksetup.pl @@ -3353,14 +3353,12 @@ if (GetFieldDef('bugs_activity', 'oldvalue')) { # http://bugzilla.mozilla.org/show_bug.cgi?id=90933 ChangeFieldType("profiles", "disabledtext", "mediumtext not null"); -# 2001-07-26 myk@mozilla.org bug39816: -# Add fields to the bugs table that record whether or not the reporter, -# assignee, QA contact, and users on the cc: list can see bugs even when +# 2001-07-26 myk@mozilla.org bug 39816 (original) +# 2002-02-06 bbaetz@student.usyd.edu.au bug 97471 (revision) +# Add fields to the bugs table that record whether or not the reporter +# and users on the cc: list can see bugs even when # they are not members of groups to which the bugs are restricted. -# 2002-02-06 bbaetz@student.usyd.edu.au - assignee/qa can always see the bug AddField("bugs", "reporter_accessible", "tinyint not null default 1"); -#AddField("bugs", "assignee_accessible", "tinyint not null default 1"); -#AddField("bugs", "qacontact_accessible", "tinyint not null default 1"); AddField("bugs", "cclist_accessible", "tinyint not null default 1"); # 2001-08-21 myk@mozilla.org bug84338: @@ -4343,6 +4341,21 @@ if (!GetFieldDef('quips', 'userid')->[2]) { $dbh->do('UPDATE quips SET userid = NULL WHERE userid = 0'); } +# 2005-02-21 - LpSolit@gmail.com - Bug 279910 +# qacontact_accessible and assignee_accessible field names no longer exist +# in the 'bugs' table. Their corresponding entries in the 'bugs_activity' +# table should therefore be marked as obsolete, meaning that they cannot +# be used anymore when querying the database - they are not deleted in +# order to keep track of these fields in the activity table. +if (!GetFieldDef('fielddefs', 'obsolete')) { + AddField('fielddefs', 'obsolete', 'tinyint not null default 0'); + print "Marking qacontact_accessible and assignee_accessible as obsolete fields...\n"; + $dbh->do("UPDATE fielddefs SET obsolete = 1 + WHERE name = 'qacontact_accessible' + OR name = 'assignee_accessible'"); +} + + # If you had to change the --TABLE-- definition in any way, then add your # differential change code *** A B O V E *** this comment. # |