From 1d18fb84ee07e7fdce85e5f60ad804e2c8e2245d Mon Sep 17 00:00:00 2001 From: "terry%mozilla.org" Date: Tue, 7 Mar 2000 21:29:19 +0000 Subject: [PATCH] Oops! canconfirm bit wasn't actually working. git-svn-id: svn://10.0.0.236/trunk@62329 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webtools/bugzilla/process_bug.cgi | 25 ++++++++--------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/mozilla/webtools/bugzilla/process_bug.cgi b/mozilla/webtools/bugzilla/process_bug.cgi index ae55fd8da4c..0e11f16cc59 100755 --- a/mozilla/webtools/bugzilla/process_bug.cgi +++ b/mozilla/webtools/bugzilla/process_bug.cgi @@ -146,13 +146,8 @@ sub CheckCanChangeField { "WHERE bug_id = $bugid"); ($reporterid, $ownerid, $qacontactid) = (FetchSQLData()); } - if ($reporterid eq $whoid || $ownerid eq $whoid || $qacontactid eq $whoid) { - if ($f ne "bug_status") { - return 1; - } - if ($newvalue eq $::unconfirmedstate || !IsOpenedState($newvalue)) { - return 1; - } + if ($f eq "bug_status" && $newvalue ne $::unconfirmedstate && + IsOpenedState($newvalue)) { # Hmm. They are trying to set this bug to some opened state # that isn't the UNCONFIRMED state. Are they in the right @@ -165,16 +160,14 @@ sub CheckCanChangeField { if ($UserInCanConfirmGroupSet) { return 1; } - my $fieldid = GetFieldID("bug_status"); - SendSQL("SELECT newvalue FROM bugs_activity " . - "WHERE fieldid = $fieldid " . - " AND oldvalue = '$::unconfirmedstate'"); - while (MoreSQLData()) { - my $n = FetchOneColumn(); - if (IsOpenedState($n) && $n ne $::unconfirmedstate) { - return 1; - } + SendSQL("SELECT everconfirmed FROM bugs WHERE bug_id = $bugid"); + my $everconfirmed = FetchOneColumn(); + if ($everconfirmed) { + return 1; } + } elsif ($reporterid eq $whoid || $ownerid eq $whoid || + $qacontactid eq $whoid) { + return 1; } SendSQL("UNLOCK TABLES"); $oldvalue = value_quote($oldvalue);