From 3f5c73cce7d1cc1b4e7323013a690d2eab225c1a Mon Sep 17 00:00:00 2001 From: "mkanat%bugzilla.org" <> Date: Tue, 22 Aug 2006 01:48:41 +0000 Subject: Bug 348537: Move bug status validation out of post_bug and into Bugzilla::Bug Patch By Max Kanat-Alexander r=bkor, a=myk --- post_bug.cgi | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'post_bug.cgi') diff --git a/post_bug.cgi b/post_bug.cgi index 7ceeffc3a..bef248836 100755 --- a/post_bug.cgi +++ b/post_bug.cgi @@ -184,23 +184,8 @@ if (Bugzilla->params->{"useqacontact"}) { } } -# Check the bug status. -# This order is important, see below. -my @valid_statuses = ('UNCONFIRMED', 'NEW', 'ASSIGNED'); - -my $bug_status = 'UNCONFIRMED'; -if ($user->in_group('editbugs') || $user->in_group('canconfirm')) { - # Default to NEW if the user with privs hasn't selected another status. - $bug_status = scalar($cgi->param('bug_status')) || 'NEW'; -} -elsif (!$product->votes_to_confirm) { - $bug_status = 'NEW'; -} -$cgi->param(-name => 'bug_status', -value => $bug_status); - -# Reject 'UNCONFIRMED' as a valid status if the product -# doesn't require votes to confirm its bugs. -shift @valid_statuses if !$product->votes_to_confirm; +$cgi->param('bug_status', Bugzilla::Bug::_check_bug_status( + scalar $cgi->param('bug_status'), $product)); if (!defined $cgi->param('target_milestone')) { $cgi->param(-name => 'target_milestone', -value => $product->default_milestone); @@ -215,7 +200,6 @@ check_field('rep_platform', scalar $cgi->param('rep_platform')); check_field('bug_severity', scalar $cgi->param('bug_severity')); check_field('priority', scalar $cgi->param('priority')); check_field('op_sys', scalar $cgi->param('op_sys')); -check_field('bug_status', scalar $cgi->param('bug_status'), \@valid_statuses); check_field('version', scalar $cgi->param('version'), [map($_->name, @{$product->versions})]); check_field('target_milestone', scalar $cgi->param('target_milestone'), -- cgit v1.2.3-24-g4f1b