Attachment 303408 Details for Bug 443461 – The patch to fix the "rename the cust_facing,devel_whiteboard,fixed_in,internal_whiteboard,qa_whiteboard "

[patch] The patch to fix the "rename the cust_facing,devel_whiteboard,fixed_in,internal_whiteboard,qa_whiteboard "

2.patch (text/plain), 16.69 KB, created by XINSUN on 2008-04-23 02:04:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: XINSUN

Created: 2008-04-23 02:04:28 UTC

Size: 16.69 KB

patch

obsolete

>Index: Bugzilla/Bug.pm
>===================================================================
>RCS file: /cvs/qa/hwcert/Bugzilla/Bug.pm,v
>retrieving revision 1.33
>diff -u -r1.33 Bug.pm
>--- Bugzilla/Bug.pm	29 Feb 2008 12:01:43 -0000	1.33
>+++ Bugzilla/Bug.pm	23 Apr 2008 01:15:34 -0000
>@@ -147,11 +147,11 @@
>       rep_platform, op_sys, bug_status, resolution, priority,
>       bug_severity, bugs.component_id, components.name, assigned_to,
>       reporter, bug_file_loc, short_desc, target_milestone,
>-      qa_contact, status_whiteboard, internal_whiteboard, qa_whiteboard, devel_whiteboard," . 
>+      qa_contact, status_whiteboard, cf_internal_whiteboard, cf_qa_whiteboard, cf_devel_whiteboard," . 
>       Bugzilla::DB::DateFormat('creation_ts','%Y-%m-%d %H:%i') . ", 
>       delta_ts, " . Bugzilla::DB::IfNullNumeric('sum(votes.vote_count)', 0) . ",
>       reporter_accessible, cclist_accessible,
>-      estimated_time, remaining_time, fixed_in, cust_facing, " . Bugzilla::DB::DateFormat('deadline','%Y-%c-%e') .
>+      estimated_time, remaining_time, cf_fixed_in, cf_cust_facing, " . Bugzilla::DB::DateFormat('deadline','%Y-%c-%e') .
>     " from bugs left join votes using(bug_id),
>       products, components
>     where bugs.bug_id = $bug_id
>@@ -162,10 +162,10 @@
>       rep_platform, op_sys, bug_status, resolution, priority, 
>       bug_severity, bugs.component_id, components.name, assigned_to, 
>       reporter, bug_file_loc, short_desc, target_milestone, 
>-      qa_contact, status_whiteboard, internal_whiteboard, qa_whiteboard, 
>-      devel_whiteboard,creation_ts, delta_ts,
>+      qa_contact, status_whiteboard, cf_internal_whiteboard, cf_qa_whiteboard, 
>+      cf_devel_whiteboard,creation_ts, delta_ts,
>       reporter_accessible, cclist_accessible,
>-      estimated_time, remaining_time, fixed_in, cust_facing, deadline";
>+      estimated_time, remaining_time, cf_fixed_in, cf_cust_facing, deadline";
> 
>    &::SendSQL($query);
>    my @row = ();
>@@ -257,8 +257,7 @@
>       $flag_type->{'flags'} =
>          Bugzilla::Flag::match({ 'bug_id'      => $self->{bug_id},
>                                  'type_id'     => $flag_type->{'id'},
>-                                 'target_type' => 'bug',
>-                                 'is_active'   => 1 });
>+                                 'target_type' => 'bug' });
>    }
>    $self->{'flag_types'} = $flag_types;
>    $self->{'any_flags_requesteeble'} = grep($_->{'is_requesteeble'}, @$flag_types);
>@@ -273,8 +272,7 @@
>                                   'component_id' => $self->{'component_id'} });
>    my $num_attachment_flags =
>       Bugzilla::Flag::count({ 'target_type'  => 'attachment',
>-                              'bug_id'       => $self->{bug_id},
>-                              'is_active'    => 1 });
>+                              'bug_id'       => $self->{bug_id} });
> 
>    $self->{'show_attachment_flags'}
>       = $num_attachment_flag_types || $num_attachment_flags;
>@@ -550,7 +548,7 @@
>     my @row=();
>     my %data=();
>     if ($self->{'resolution'} eq 'DUPLICATE' && $self->{'bug_status'} eq 'CLOSED') { 
>-        my $sth = Bugzilla->dbh->prepare("SELECT bug_status, rep_platform, version, fixed_in, resolution
>+        my $sth = Bugzilla->dbh->prepare("SELECT bug_status, rep_platform, version, cf_fixed_in, resolution
>                                           FROM bugs
>                                           WHERE bug_id = ?");
>         $sth->execute($self->{dup_id});
>@@ -601,8 +599,8 @@
>     $self->{'dups_list'} = undef;
>     my @row=();
>     my @data=();
>-    my $sth = Bugzilla->dbh->prepare("SELECT bugs.bug_id, bugs.devel_whiteboard, 
>-                                             bugs.status_whiteboard, bugs.qa_whiteboard, 
>+    my $sth = Bugzilla->dbh->prepare("SELECT bugs.bug_id, bugs.cf_devel_whiteboard, 
>+                                             bugs.status_whiteboard, bugs.cf_qa_whiteboard, 
>                                              bugs.bug_status, bugs.resolution
>                                       FROM bugs
>                                       WHERE bug_id IN (SELECT dupe 
>Index: Bugzilla/Search.pm
>===================================================================
>RCS file: /cvs/qa/hwcert/Bugzilla/Search.pm,v
>retrieving revision 1.8
>diff -u -r1.8 Search.pm
>--- Bugzilla/Search.pm	6 Feb 2008 21:31:41 -0000	1.8
>+++ Bugzilla/Search.pm	23 Apr 2008 01:15:34 -0000
>@@ -339,8 +339,8 @@
>     }
> 
>     foreach my $f ("short_desc", "long_desc", "bug_file_loc",
>-                   "status_whiteboard", "qa_whiteboard", 
>-                   "devel_whiteboard", "internal_whiteboard") {
>+                   "status_whiteboard", "cf_qa_whiteboard", 
>+                   "cf_devel_whiteboard", "cf_internal_whiteboard") {
>         if (defined $params->param($f)) {
>             my $s = trim($params->param($f));
>             if ($s ne "") {
>@@ -643,8 +643,7 @@
>              # negative conditions (f.e. "flag isn't review+").
>              my $flags = "flags_$chartid";
>              push(@jointables, "LEFT JOIN flags $flags " . 
>-                               "ON bugs.bug_id = $flags.bug_id " .
>-                               "AND $flags.is_active = 1");
>+                               "ON bugs.bug_id = $flags.bug_id "); 
>              my $flagtypes = "flagtypes_$chartid";
>              push(@jointables, "LEFT JOIN flagtypes $flagtypes " . 
>                                "ON $flags.type_id = $flagtypes.id");
>@@ -1156,7 +1155,7 @@
>                b2.bug_status AS parent_status, 
>                b2.resolution AS parent_resolution,
>                b2.version AS parent_version,
>-               b2.fixed_in AS parent_fixed_in
>+               b2.cf_fixed_in AS parent_cf_fixed_in
>         FROM   bugs b1, bugs b2, duplicates 
>         WHERE  b2.bug_id = dupe_of AND b1.bug_id = dupe
>                AND b1.product_id = 58 AND b2.product_id = 58 ";
>@@ -1165,7 +1164,7 @@
>     $logger->debug("sql query executed");
> 
> 
>-    $query .= " , (CASE WHEN internal_whiteboard = 'Component/Peripheral' THEN 1 ELSE 0 END) as sortorder0 "; 
>+    $query .= " , (CASE WHEN cf_internal_whiteboard = 'Component/Peripheral' THEN 1 ELSE 0 END) as sortorder0 "; 
> 
>     $query .= " , (CASE WHEN ext_bz_bug_id IS NULL THEN 0 ELSE 1 END) as sortorder1 "; 
> 
>Index: globals.pl
>===================================================================
>RCS file: /cvs/qa/hwcert/globals.pl,v
>retrieving revision 1.23
>diff -u -r1.23 globals.pl
>--- globals.pl	31 Oct 2007 14:18:20 -0000	1.23
>+++ globals.pl	23 Apr 2008 01:15:34 -0000
>@@ -114,7 +114,7 @@
> #}
> #$::SIG{__DIE__} = \&die_with_dignity;
> 
>-@::default_column_list = ("devel_whiteboard", "status_whiteboard", "qa_whiteboard", "version", "internal_whiteboard", "bug_status", "rep_platform" );
>+@::default_column_list = ("cf_devel_whiteboard", "status_whiteboard", "cf_qa_whiteboard", "version", "cf_internal_whiteboard", "bug_status", "rep_platform" );
> 
> @::default_fz_column_list = ("short_desc","component","priority","bug_severity","reporter",
>                              "bug_status","resolution","assigned_to","version","status_whiteboard",
>
>Index: list.cgi
>===================================================================
>RCS file: /cvs/qa/hwcert/list.cgi,v
>retrieving revision 1.24
>diff -u -r1.24 list.cgi
>--- list.cgi	6 Feb 2008 21:31:40 -0000	1.24
>+++ list.cgi	23 Apr 2008 01:15:34 -0000
>@@ -112,7 +112,7 @@
> my $serverpush = 0;
> 
> my $order = $::FORM{'order'} || "";
>-my $devel_whiteboard = $::FORM{'devel_whiteboard'} || "";
>+my $cf_devel_whiteboard = $::FORM{'cf_devel_whiteboard'} || "";
> my $status_whiteboard = $::FORM{'status_whiteboard'} || "";
> my $order_from_cookie = 0;  # True if $order set using $::COOKIE{'LASTORDER'}
> 
>@@ -281,11 +281,11 @@
> DefineColumn("short_short_desc"  , "bugs.short_desc"            , "Summary"          );
> DefineColumn("short_desc"        , "bugs.short_desc"            , "Summary"          );
> DefineColumn("status_whiteboard" , "bugs.status_whiteboard"     , "Status Summary"   );
>-DefineColumn("fixed_in"          , "bugs.fixed_in"              , "Fixed In"         );
>+DefineColumn("cf_fixed_in"          , "bugs.cf_fixed_in"              , "Fixed In"         );
> DefineColumn("cust_facing"       , "bugs.cust_facing"           , "Customer Facing"  );
>-DefineColumn("qa_whiteboard"     , "bugs.qa_whiteboard"         , "QA Whiteboard"    );
>-DefineColumn("devel_whiteboard"  , "bugs.devel_whiteboard"      , "Devel Whiteboard" );
>-DefineColumn("internal_whiteboard", "bugs.internal_whiteboard"  , "Int Whiteboard"   );
>+DefineColumn("cf_qa_whiteboard"     , "bugs.cf_qa_whiteboard"         , "QA Whiteboard"    );
>+DefineColumn("cf_devel_whiteboard"  , "bugs.cf_devel_whiteboard"      , "Devel Whiteboard" );
>+DefineColumn("cf_internal_whiteboard", "bugs.cf_internal_whiteboard"  , "Int Whiteboard"   );
> DefineColumn("component"         , "map_components.name"        , "Component"        );
> DefineColumn("product"           , "map_products.name"          , "Product"          );
> DefineColumn("version"           , "bugs.version"               , "Version"          );
>@@ -302,7 +302,7 @@
> DefineColumn("parent_status"     , "parent_bugs.parent_status"     , "Parent_status"    );
> DefineColumn("parent_resolution" , "parent_bugs.parent_resolution" , "Parent_resolution");
> DefineColumn("parent_version"    , "parent_bugs.parent_version"    , "Parent_version"   );
>-DefineColumn("parent_fixed_in"   , "parent_bugs.parent_fixed_in"   , "Parent_fixed_in"  );
>+DefineColumn("parent_cf_fixed_in"   , "parent_bugs.parent_cf_fixed_in"   , "Parent_fixed_in"  );
> DefineColumn("ext_bz_bug_count"  , "COUNT(ext_bz_bug_map.bug_id) AS ext_bz_bug_count" , "Notes");
> 
> ################################################################################
>@@ -347,10 +347,10 @@
>         $params->param(-name=>'parent_resolution', -values=>\@newresolutions);
>     }
> }
>-if ($params->param('internal_whiteboard')) {
>+if ($params->param('cf_internal_whiteboard')) {
>     my $chart_count = 0;
>-    foreach my $value ($params->param('internal_whiteboard')) {
>-        $params->param(-name=>"field0-0-$chart_count", -value=>'internal_whiteboard');
>+    foreach my $value ($params->param('cf_internal_whiteboard')) {
>+        $params->param(-name=>"field0-0-$chart_count", -value=>'cf_internal_whiteboard');
>         $params->param(-name=>"type0-0-$chart_count", -value=>'substring');
>         $params->param(-name=>"value0-0-$chart_count", -value=>$value);
>         $chart_count++;
>@@ -365,10 +365,10 @@
>         $chart_count++;
>     }
> }
>-if ($params->param('devel_whiteboard')) {
>+if ($params->param('cf_devel_whiteboard')) {
>     my $chart_count = 0;
>-    foreach my $value ($params->param('devel_whiteboard')) {
>-        $params->param(-name=>"field0-0-$chart_count", -value=>'devel_whiteboard');
>+    foreach my $value ($params->param('cf_devel_whiteboard')) {
>+        $params->param(-name=>"field0-0-$chart_count", -value=>'cf_devel_whiteboard');
>         $params->param(-name=>"type0-0-$chart_count", -value=>'substring');
>         $params->param(-name=>"value0-0-$chart_count", -value=>$value);
>         $chart_count++;
>@@ -405,15 +405,15 @@
>     $params->param(-name=>'type0-0-1', -value=>'substring');
>     $params->param(-name=>'value0-0-1', -value=>$quicksearch);
> 
>-    $params->param(-name=>'field0-0-2', -value=>'qa_whiteboard');
>+    $params->param(-name=>'field0-0-2', -value=>'cf_qa_whiteboard');
>     $params->param(-name=>'type0-0-2', -value=>'substring');
>     $params->param(-name=>'value0-0-2', -value=>$quicksearch);
> 
>-    $params->param(-name=>'field0-0-3', -value=>'devel_whiteboard');
>+    $params->param(-name=>'field0-0-3', -value=>'cf_devel_whiteboard');
>     $params->param(-name=>'type0-0-3', -value=>'substring');
>     $params->param(-name=>'value0-0-3', -value=>$quicksearch);
> 
>-    $params->param(-name=>'field0-0-4', -value=>'internal_whiteboard');
>+    $params->param(-name=>'field0-0-4', -value=>'cf_internal_whiteboard');
>     $params->param(-name=>'type0-0-4', -value=>'substring');
>     $params->param(-name=>'value0-0-4', -value=>$quicksearch);
> 
>@@ -483,11 +483,11 @@
> # The bug ID is always selected because bug IDs are always displayed.
> # Severity, priority, resolution are required for buglist
> # CSS classes.
>-my @selectcolumns = ("bug_id", "resolution", "fixed_in", "ext_bz_bug_count");
>+my @selectcolumns = ("bug_id", "resolution", "cf_fixed_in", "ext_bz_bug_count");
> 
> # In case there are duplicates we need to check the parents status/resolution 
> # because all dupes, are CLOSED/DUPLICATE
>-my @parentcolumns = ("parent_id", "parent_status", "parent_resolution", "parent_version", "parent_fixed_in");
>+my @parentcolumns = ("parent_id", "parent_status", "parent_resolution", "parent_version", "parent_cf_fixed_in");
> push (@selectcolumns, @parentcolumns);
> 
> 
>@@ -631,8 +631,8 @@
> # $main_query .= " ORDER BY $db_order " if ($order);
> 
> # Put the clean certs first, then order by Vendor/Make/Model.
>-$main_query .= " ORDER BY sortorder0, devel_whiteboard, sortorder1, status_whiteboard, 
>-                          qa_whiteboard, version DESC, fixed_in ";
>+$main_query .= " ORDER BY sortorder0, cf_devel_whiteboard, sortorder1, status_whiteboard, 
>+                          cf_qa_whiteboard, version DESC, cf_fixed_in ";
> 
> # Form query for next list of results;
> my $showall    = $params->param('showall');
>@@ -875,9 +875,9 @@
> # then we remove all non-query fields from it, f.e. the sort order (order)
> # and command type (cmdtype) fields.
> $vars->{'urlquerypart'} = $::buffer;
>-$vars->{'urlquerypart'} =~ s/(order|cmdtype|devel_whiteboard|status_whiteboard)=[^&]*&?//g;
>+$vars->{'urlquerypart'} =~ s/(order|cmdtype|cf_devel_whiteboard|status_whiteboard)=[^&]*&?//g;
> $vars->{'order'} = $order;
>-$vars->{'devel_whiteboard'} = $devel_whiteboard;
>+$vars->{'cf_devel_whiteboard'} = $cf_devel_whiteboard;
> $vars->{'status_whiteboard'} = $status_whiteboard;
> $vars->{'caneditbugs'} = UserInGroup('editbugs');
> 
>Index: template/en/default/list/table.html.tmpl
>===================================================================
>RCS file: /cvs/qa/hwcert/template/en/default/list/table.html.tmpl,v
>retrieving revision 1.16
>diff -u -r1.16 table.html.tmpl
>--- template/en/default/list/table.html.tmpl	6 Nov 2007 16:09:28 -0000	1.16
>+++ template/en/default/list/table.html.tmpl	23 Apr 2008 01:15:34 -0000
>@@ -30,7 +30,7 @@
> [% current_vendor  = 'foo' %]
> 
> [%## A bit hacky since we might not actually display the 0th record %]
>-[% "<h2>Systems</h2>" IF bugs.0.internal_whiteboard != "Component/Peripheral" %]
>+[% "<h2>Systems</h2>" IF bugs.0.cf_internal_whiteboard != "Component/Peripheral" %]
> 
> <table class="listcgi" width="95%">
> 
>@@ -46,25 +46,25 @@
>   [% display_count = display_count + 1%]
> 
>   [%## Bugzilla <-> HwCert field map #%]
>-  [% vendor = bug.devel_whiteboard %]
>+  [% vendor = bug.cf_devel_whiteboard %]
>   [% make = bug.status_whiteboard %]
>-  [% model = bug.qa_whiteboard %]
>-  [% class = bug.internal_whiteboard %]
>+  [% model = bug.cf_qa_whiteboard %]
>+  [% class = bug.cf_internal_whiteboard %]
> 
>   [%## Fix the Quarterly Update vs. Update vs. .Y to match current branding %]
>   [% version = BLOCK %]
>     [% bug.product %]
>-    [% IF bug.fixed_in %]
>+    [% IF bug.cf_fixed_in %]
>       [% IF bug.version >= 5 %]
>-        [% bug.fixed_in.replace('-?Q?U','.') %]
>+        [% bug.cf_fixed_in.replace('-?Q?U','.') %]
>       [% ELSIF bug.version == 4 %]
>-        [% IF bug.fixed_in.match('U[1|2|3|4]') %]
>-          [% bug.fixed_in.replace('-?Q?U',' Update ') %]
>+        [% IF bug.cf_fixed_in.match('U[1|2|3|4]') %]
>+          [% bug.cf_fixed_in.replace('-?Q?U',' Update ') %]
>         [% ELSE %]
>-          [% bug.fixed_in.replace('-?Q?U','.') %]
>+          [% bug.cf_fixed_in.replace('-?Q?U','.') %]
>         [% END %]
>       [% ELSE %]
>-        [% bug.fixed_in.replace('-Q?U',' Update ') %]
>+        [% bug.cf_fixed_in.replace('-Q?U',' Update ') %]
>       [% END %]
>     [% ELSE %]
>       RHEL[% bug.version %]
>Index: template/en/default/search/form_release.html.tmpl
>===================================================================
>RCS file: /cvs/qa/hwcert/template/en/default/search/form_release.html.tmpl,v
>retrieving revision 1.6
>diff -u -r1.6 form_release.html.tmpl
>--- template/en/default/search/form_release.html.tmpl	18 Oct 2007 19:12:56 -0000	1.6
>+++ template/en/default/search/form_release.html.tmpl	23 Apr 2008 01:15:34 -0000
>@@ -1,9 +1,9 @@
> 
>-[% serverQuery  = "internal_whiteboard=Server" %]
>-[% desktopQuery = "internal_whiteboard=Desktop/Workstation" %]
>-[% laptopQuery  = "internal_whiteboard=Laptop" %]
>+[% serverQuery  = "cf_internal_whiteboard=Server" %]
>+[% desktopQuery = "cf_internal_whiteboard=Desktop/Workstation" %]
>+[% laptopQuery  = "cf_internal_whiteboard=Laptop" %]
> [% systemQuery  = [ serverQuery, desktopQuery, laptopQuery ] %]
>-[% componentQuery = "internal_whiteboard=Component/Peripheral" %]
>+[% componentQuery = "cf_internal_whiteboard=Component/Peripheral" %]
> 
> 
> <h2 class="accentLightWide"><span>Browse Red Hat Enterprise Linux Certified Hardware</span></h2>

Actions: View | Diff

Attachments on bug 443461: 303408 | 303768 | 304089 | 304300