Attachment 312231 Details for Bug 454593 – But to map the needinfo to NEEDINFO

[patch] But to map the needinfo to NEEDINFO

bug454593.patch (text/plain), 8.14 KB, created by eric_liu on 2008-07-21 07:10:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: eric_liu

Created: 2008-07-21 07:10:58 UTC

Size: 8.14 KB

patch

obsolete

>Index: process.cgi
>===================================================================
>RCS file: /cvs/qa/hwcert/process.cgi,v
>retrieving revision 1.29
>diff -u -r1.29 process.cgi
>--- process.cgi	14 May 2008 05:18:33 -0000	1.29
>+++ process.cgi	21 Jul 2008 06:49:22 -0000
>@@ -933,6 +938,20 @@
> # Flag for adding comment if we are certifying this
> my $certified = 0;
> 
>+
>+ my $hw_type_name = 'needinfo';
>+ SendSQL("SELECT id FROM flagtypes WHERE name = ". SqlQuote($hw_type_name));
>+ my $hw_type_id = FetchOneColumn();
>+
>+ my $current_user_id = Bugzilla->user->id;
>+ my $current_bug_id = $::FORM{'id'};
>+          
>+ SendSQL("SELECT assigned_to, qa_contact, reporter FROM bugs WHERE bug_id = $current_bug_id");
>+ (my $bug_assigned_to,my $bug_qa_contact,my $bug_reporter)= (FetchSQLData());
>+  my $flagtype_form = "flag_type-$hw_type_id";
>+  my $requestee_form ="requestee-$hw_type_id";
>+
> CheckFormFieldDefined(\%::FORM, 'knob');
> SWITCH: for ($::FORM{'knob'}) {
>     /^none$/ && do {
>@@ -946,7 +965,7 @@
>     };
> 
>     # backwards compat. for buglist.cgi.
>-    /^(?:accept|needinfo|modified|assign_to_pm|investigate|spec|on_dev|qa_ready|on_qa|fails_qa|prod_ready)$/ && do {
>+     /^(?:accept|requestee_reporter|requestee_qa_contact|requestee_assigned_to|assign_to_pm|investigate|spec|on_dev|qa_ready|fails_qa|prod_ready)$/ && do{
>       $::FORM{'newstatus'} = 'accept';
>       $::FORM{'knob'} = 'changestatus';
>       # last STATUS   #NOT!
>@@ -964,22 +983,26 @@
>                 }
>                 last STATUS;
>             };
>-            /^assigned$/ && do {
>-                $::FORM{'bug_status'} = 'ASSIGNED';
>+            
>+               /^requestee_none$/ && do {
>+                $::FORM{'hwcert'}       = '';
>+                $::FORM{$flagtype_form} = '';	
>                 last STATUS;
>             };
>-            /^needinfo$/ && do {
>-                $::FORM{'bug_status'} = 'NEEDINFO';
>+            /^requestee_reporter$/ && do{ 
>+                $::FORM{'hwcert'}       = $bug_reporter;
>+                $::FORM{$flagtype_form} = '?';
>                 last STATUS;
>             };
>             /^needinfo_reporter$/ && do {
>                 $::FORM{'bug_status'} = 'NEEDINFO_REPORTER';
>                 last STATUS;
>             };
>-            /^modified$/ && do {
>-                $::FORM{'bug_status'} = 'MODIFIED';
>+             /^requestee_qa_contact$/ && do {
>+                $::FORM{'hwcert'}       = $bug_reporter;
>+                $::FORM{$flagtype_form} = '?';            
>                 last STATUS;
>-            };
>+                                  };
>             /^on_dev$/ && do {
>                 $::FORM{'bug_status'} = 'ON_DEV';
>                 last STATUS;
>@@ -988,8 +1011,12 @@
>                 $::FORM{'bug_status'} = 'QA_READY';
>                 last STATUS;
>             };
>-            /^on_qa$/ && do {
>-                $::FORM{'bug_status'} = 'ON_QA';
>+            
>+#            /^on_qa$/ && do {
>+#                 $::FORM{'bug_status'} = 'ON_QA';
>+            /^requestee_assigned_to$/ && do {
>+                $::FORM{'hwcert'}       = $bug_reporter;
>+                $::FORM{$flagtype_form} = '?';
>                 last STATUS;
>             };
>             /^verified$/ && do {
>@@ -2114,9 +2141,9 @@
>                         || $::FORM{'needinfo_override'}) {
>                         $status_change = 1;
>                         $cgi->param(-name=>"flag-" . $flag->{'id'}, -value=>'X');
>-                    }
>-                }
>-            }
>+                                                        }
>+                                           }
>+                                 }
> 
>             SendSQL("SELECT reporter FROM bugs WHERE bug_id = $id");
>             my $reporterid = FetchOneColumn();
>@@ -2137,9 +2164,13 @@
>             if (Bugzilla->user->id == $reporterid) {
>                 SendSQL("UPDATE bugs SET bug_status = 'ASSIGNED' WHERE bug_id = $id");
>                 $new = 'ASSIGNED';
>-            }
>-        }
>+            					}
>+        			 }
>         # REDHAT end
>+   
>+       
>+        
>+
> 
>         if ($old ne $new) {
> 
>@@ -2621,3 +2652,5 @@
> $template->process("global/footer.html.tmpl", $vars)
>   || ThrowTemplateError($template->error());
> $logger->debug("ending");
>+
>+close PROC_LOG;
>Index: Bugzilla/Bug.pm
>===================================================================
>RCS file: /cvs/qa/hwcert/Bugzilla/Bug.pm,v
>retrieving revision 1.34
>diff -u -r1.34 Bug.pm
>--- Bugzilla/Bug.pm	16 Jul 2008 10:16:44 -0000	1.34
>+++ Bugzilla/Bug.pm	21 Jul 2008 06:49:22 -0000
>@@ -79,7 +79,8 @@
>                     use_keywords any_flags_requesteeble tests rpms cert_status 
>                     cert_supported cert_type canedit hardware platforms exception_reason 
>                     shipped_to_rh shipping_info large_agree access_info large_agree_allow
>-                    testplanstatus testplanarea testplanboxes tam_ack release_year release_month release_day
>+                    testplanstatus testplanarea testplanboxes tam_ack 
>+                    release_year release_month release_day requestee_id flagstatus
>                    ),
>                  fields()) {
>     $ok_field{$key}++;
>@@ -225,6 +226,9 @@
>    if (@cc) {
>       $self->{'cc'} = \@cc;
>    }
>+   
>+   
>+   
> 
>    # IssueTracker ID's
>    $self->{'issuetrackers'} = Bugzilla::IssueTrackerList->
>@@ -245,11 +249,13 @@
>          $self->{'keywords'} = join(', ', @list);
>       }
>    }
>+   
>    $self->{'attachments'} = Bugzilla::Attachment::query($self->{bug_id});
> 
>    # The types of flags that can be set on this bug.
>    # If none, no UI for setting flags will be displayed.
>-   my $flag_types = 
>+   
>+   my $flag_types =
>       Bugzilla::FlagType::match({ 'target_type'  => 'bug', 
>                                   'product_id'   => $self->{'product_id'}, 
>                                   'component_id' => $self->{'component_id'} });
>@@ -261,8 +267,17 @@
>    $self->{'any_flags_requesteeble'} = grep($_->{'is_requesteeble'}, @$flag_types);
> 
>+   &::SendSQL("select requestee_id from flags where bug_id = $bug_id order by id desc limit 1 ");
>+   my $requestee_id = &::FetchOneColumn(); 
>+   $self->{'requestee_id'} = $requestee_id;
>+
>+   &::SendSQL("select status from flags where bug_id = $bug_id limit 1");
>+   my $flagstatus = &::FetchOneColumn(); 
>+   $self->{'flagstatus'} = $flagstatus;
>+
>    # The number of types of flags that can be set on attachments to this bug
>    # and the number of flags on those attachments.  One of these counts must be
>    # greater than zero in order for the "flags" column to appear in the table
> 
>Index: Bugzilla/Flag.pm
>===================================================================
>RCS file: /cvs/qa/hwcert/Bugzilla/Flag.pm,v
>retrieving revision 1.2
>diff -u -r1.2 Flag.pm
>--- Bugzilla/Flag.pm	19 Jul 2007 19:31:53 -0000	1.2
>+++ Bugzilla/Flag.pm	21 Jul 2008 06:49:22 -0000 
>@@ -502,11 +506,13 @@
>             status => $status 
>         };
> 
>+
>         if ($status eq "?") {
>             my $requestee = $data->{"requestee_type-$type_id"};
>-            if ($requestee) {
>-                my $requestee_id = &::DBname_to_id($requestee);
>-                $flag->{'requestee'} = new Bugzilla::User($requestee_id);
>+            my $hwcert = $data->{"hwcert"};
>+            if ($hwcert){
>+            	my $requestee_id = &::DBname_to_id($hwcert);
>+            	$flag->{'requestee'} = new Bugzilla::User($hwcert);
>             }
>         }
>         
>
>Index: template/en/default/bug/edit.html.tmpl
>===================================================================
>RCS file: /cvs/qa/hwcert/template/en/default/bug/edit.html.tmpl,v
>retrieving revision 1.59
>diff -u -r1.59 edit.html.tmpl
>--- template/en/default/bug/edit.html.tmpl	29 Feb 2008 12:09:38 -0000	1.59
>+++ template/en/default/bug/edit.html.tmpl	21 Jul 2008 06:49:23 -0000
>@@ -68,11 +68,13 @@
>       [% PROCESS bug/external_bugzilla.html.tmpl 
>          external_bugs = bug.external_bugs
>          external_bugzilla_list = bug.external_bugzilla_list %]
>+      [% PROCESS bug/dialog_status.html.tmpl %]
>     </div>
> 
>     <div id="dialog">
>       [% PROCESS "bug/certification-comments.html.tmpl" %]
>-      [% PROCESS bug/status_edit.html.tmpl %]
>+      [% PROCESS bug/certification_status.html.tmpl %]
>+      [%# PROCESS bug/status_edit.html.tmpl %]
>     </div>
> 
>     <div id="review">

Actions: View | Diff

Attachments on bug 454593: 312231 | 312356 | 312360 | 312381 | 312413 | 312693 | 312921