From f74ec2dc2448b5029574713de288725decfc9173 Mon Sep 17 00:00:00 2001
From: "ghendricks%novell.com"
 <ghendricks%novell.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 27 Oct 2006 17:21:26 +0000
Subject: [PATCH] Added support for searching by build_id and category_id

git-svn-id: svn://10.0.0.236/trunk@214245 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../webtools/testopia/Bugzilla/Testopia/Search.pm   | 13 +++++++++++--
 mozilla/webtools/testopia/tr_list_caseruns.cgi      |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/mozilla/webtools/testopia/Bugzilla/Testopia/Search.pm b/mozilla/webtools/testopia/Bugzilla/Testopia/Search.pm
index 2627fa4568e..1b65c95f3a8 100644
--- a/mozilla/webtools/testopia/Bugzilla/Testopia/Search.pm
+++ b/mozilla/webtools/testopia/Bugzilla/Testopia/Search.pm
@@ -338,6 +338,15 @@ sub init {
                       "ON test_cases.category_id = categories.category_id");
                $f = "categories.name";
          },
+         "^category_id," => sub {
+               if ($obj eq 'case_run'){
+                   push(@supptables,
+                          "INNER JOIN test_cases " .
+                          "ON test_case_runs.case_id = test_cases.case_id");
+               }                   
+               
+               $f = "test_cases.category_id";
+         },
          "^build," => sub {
                my $str = '';
                $str = 'case_' if ($obj eq 'case_run');
@@ -787,10 +796,10 @@ sub init {
         }
     }        
     # Check the Multi select fields and add them to the chart
-    my @legal_fields = ("case_status_id", "category", "priority_id",
+    my @legal_fields = ("case_status_id", "category", "category_id", "priority_id",
                         "component", "isautomated", "case_run_status_id",
                         "default_product_version", "type_id", 
-                        "build", "environment_id", "milestone", "env_products",
+                        "build", "build_id", "environment_id", "milestone", "env_products",
                         "env_categories", "env_elements", "env_properties", 
                         "env_expressions", "case_status", "priority", "environment",
                         "plan_type", "case_run_status");
diff --git a/mozilla/webtools/testopia/tr_list_caseruns.cgi b/mozilla/webtools/testopia/tr_list_caseruns.cgi
index 883c261da13..e26852cf16d 100755
--- a/mozilla/webtools/testopia/tr_list_caseruns.cgi
+++ b/mozilla/webtools/testopia/tr_list_caseruns.cgi
@@ -134,7 +134,7 @@ if ($action eq 'Commit'){
     }
     $vars->{'title'} = "Update Successful";
     $vars->{'tr_message'} = "$i Test Case-Runs Updated";
-    if ($serverpush) {
+    if ($serverpush && !$cgi->param('debug')) {
         print $cgi->multipart_end;
         print $cgi->multipart_start;
     }
@@ -254,7 +254,7 @@ $vars->{'component_list'} =  $case->get_available_components();
 $vars->{'dotweak'} = UserInGroup('edittestcases');
 $vars->{'table'} = $table;
 $vars->{'action'} = 'tr_list_caserun.cgi';
-if ($serverpush) {
+if ($serverpush && !$cgi->param('debug')) {
     print $cgi->multipart_end;
     print $cgi->multipart_start;
 }