Attachment 317452 Details for Bug 458492 – patch improvement.

[patch] patch improvement.

leverage.patch (text/plain), 4.55 KB, created by XINSUN on 2008-09-23 08:47:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: XINSUN

Created: 2008-09-23 08:47:18 UTC

Size: 4.55 KB

patch

obsolete

>Index: process.cgi
>===================================================================
>RCS file: /cvs/qa/hwcert/process.cgi,v
>retrieving revision 1.37
>diff -u -r1.37 process.cgi
>--- process.cgi	3 Sep 2008 05:07:42 -0000	1.37
>+++ process.cgi	23 Sep 2008 08:46:15 -0000
>@@ -2194,12 +2194,6 @@
>         }
>     }
> 
>-    # Set and update flags.
>-    if ($UserInEditGroupSet) {
>-        my $target = Bugzilla::Flag::GetTarget($id);
>-        Bugzilla::Flag::process($target, $timestamp, \%::FORM);
>-    }
>-
>     # HWCERT HACK: Do some extra hwcert stuff
>     my $cert_changed = 0;
>     if (UserInGroup('hwcert_edit')) {
>@@ -2491,6 +2485,71 @@
>             AddNewTestplanItem($cgi->param('add_testplan'), $cid, $whoid, $cgi->param("testplan_with_class"));
>         }
>     }
>+    
>+    if ($bug_status ne 'CLOSED' && $cid) {
>+    	my $need_leverage_review = 0; 
>+        if ($cgi->param("testplan_with_class")) {
>+            my $dbh2 = Bugzilla->dbh2;
>+    	    SendSQL2("SELECT testplan_desc.result_32bits FROM testplan_desc, testplan WHERE testplan.class = 'Frozen' AND testplan.cert_id = testplan_desc.cert_id AND testplan_desc.result_32bits IS NOT NULL AND testplan_desc.bits32 !=1 AND testplan_desc.cert_id = $cid");
>+    	    while (MoreSQLData2()) {
>+       	        my $need_review_test_id = FetchOneColumn2();
>+                my $query_sql = "SELECT cert_id FROM cert_tests WHERE id = $need_review_test_id";
>+                my $sth = $dbh2->prepare( $query_sql );
>+                $sth->execute;
>+                my ($cert_id) = $sth->fetchrow_array();
>+                if ($cert_id ne $cid) {
>+                    $need_leverage_review = 1;
>+                    last;
>+                } 
>+            }
>+       
>+            if ($need_leverage_review != 1) {
>+            	SendSQL2("SELECT testplan_desc.result_64bits FROM testplan_desc, testplan WHERE testplan.class = 'Frozen' AND testplan.cert_id = testplan_desc.cert_id AND testplan_desc.result_64bits IS NOT NULL AND testplan_desc.bits64 !=1 AND testplan_desc.cert_id = $cid");
>+            	while (MoreSQLData2()) {
>+                    my $need_review_test_id = FetchOneColumn2();
>+                    my $query_sql = "SELECT cert_id FROM cert_tests WHERE id = $need_review_test_id";
>+                    my $sth = $dbh2->prepare( $query_sql );
>+                    $sth->execute;
>+                    my ($cert_id) = $sth->fetchrow_array();
>+                    if ($cert_id ne $cid) {
>+                        $need_leverage_review = 1;
>+                        last;
>+                    }
>+                }
>+            }
>+        } elsif ($cgi->param("testplan_without_class")) {
>+            SendSQL2("SELECT testplan_desc.id FROM testplan.class='Frozen' AND testplan_desc.location='leverage' AND ( ((required_32bits='1' AND required_64bits='1') AND ( bits32 ='0' OR bits64 ='0' )) OR ((required_32bits='1' AND required_64bits='0') AND ( bits32 ='0' )) OR ((required_32bits='0' AND required_64bits='1') AND ( bits64 ='0' )) ) AND testplan.cert_id=testplan_desc.cert_id AND testplan_desc.cert_id = $cid");
>+            if (MoreSQLData2()) {
>+                $need_leverage_review = 1;
>+            }
>+        }   
>+
>+        my $flag_types = $bug->{'flag_types'};
>+        my $leverage_flag_id = "0";
>+        my $leverage_flagtype_id = "0";
>+        my $leverage_flag_status = "";
>+        foreach my $type (@{$flag_types}) {
>+            if ($type->{'name'} eq "hwcert_work_leverage_review") {
>+                $leverage_flagtype_id = $type->{'id'};
>+                foreach my $flag (@{$type->{'flags'}}) {
>+                    $leverage_flag_id = $flag->{'id'};
>+                    $leverage_flag_status = $flag->{'status'};
>+                }  
>+            }
>+        }
>+
>+        if ($need_leverage_review) {
>+            if ($leverage_flag_status ne "+") {
>+                my $form_flagtype_id = "flag_type-" . $leverage_flagtype_id; 
>+                $::FORM{"$form_flagtype_id"} = "+";
>+            }
>+        } else {
>+            if ($leverage_flag_status eq "+") {
>+                my $form_leverage_flag_id = "flag-" . $leverage_flag_id; 
>+                $::FORM{"$form_leverage_flag_id"} = "X";
>+            }  
>+        }
>+    } 
> 
>     # Update TAM ack, eg. add/subtrack the support group.
>     if ( UserInGroup('support') ) {
>@@ -2499,6 +2558,10 @@
>         TamAck($id, $new_ack, $whoid);
>     }
>     
>+    # Set and update flags.
>+    my $target = Bugzilla::Flag::GetTarget($id);
>+    Bugzilla::Flag::process($target, $timestamp, \%::FORM);
>+
>     # Add Post date feature
>     my $use_postdate   = $cgi->param('use_postdate');
>     if ($use_postdate && $new_postdate) {

Actions: View | Diff

Attachments on bug 458492: 317452