Login
Log in using an SSO provider:
Fedora Account System
Red Hat Associate
Red Hat Customer
Login using a Red Hat Bugzilla account
Forgot Password
Create an Account
Red Hat Bugzilla – Attachment 304300 Details for
Bug 443461
FEAT: Match the new db schema of bz3.0 [2. TABLE bugs]
Home
New
Search
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh90 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
[?]
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
The new clean patch
bugs.patch (text/plain), 47.37 KB, created by
XINSUN
on 2008-05-01 08:42:24 UTC
(
hide
)
Description:
The new clean patch
Filename:
MIME Type:
Creator:
XINSUN
Created:
2008-05-01 08:42:24 UTC
Size:
47.37 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 1 May 2008 08:13:19 -0000 >@@ -50,10 +50,10 @@ > product component version rep_platform op_sys > bug_status resolution > bug_file_loc status_whiteboard keywords >- internal_whiteboard qa_whiteboard devel_whiteboard >+ cf_internal_whiteboard cf_qa_whiteboard cf_devel_whiteboard > priority bug_severity target_milestone >- dependson blocked votes cust_facing >- reporter assigned_to cc fixed_in deadline >+ dependson blocked votes cf_cust_facing >+ reporter assigned_to cc cf_fixed_in deadline > ); > > if (Param('useqacontact')) { >@@ -138,8 +138,6 @@ > > $self->{'whoid'} = $user_id; > >-# my $inqa = &::UserInGroup("qa_whiteboard"); >-# my $indevel = &::UserInGroup("devel"); > > my $query = " > SELECT >@@ -147,11 +145,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 +160,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 = (); >@@ -177,10 +175,10 @@ > "priority", "bug_severity", "component_id", "component", > "assigned_to", "reporter", "bug_file_loc", "short_desc", > "target_milestone", "qa_contact", "status_whiteboard", >- "internal_whiteboard", "qa_whiteboard", "devel_whiteboard", >+ "cf_internal_whiteboard", "cf_qa_whiteboard", "cf_devel_whiteboard", > "creation_ts", "delta_ts", "votes", > "reporter_accessible", "cclist_accessible", >- "estimated_time", "remaining_time", "fixed_in", "cust_facing","deadline"); >+ "estimated_time", "remaining_time", "cf_fixed_in", "cf_cust_facing","deadline"); > > # if (!$inqa) { > # delete $row[18]; >@@ -550,7 +546,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}); >@@ -558,7 +554,7 @@ > $data{'status'} = shift @row; > $data{'platform'} = shift @row; > $data{'version'} = shift @row; >- $data{'fixed_in'} = shift @row; >+ $data{'cf_fixed_in'} = shift @row; > $data{'resolution'} = shift @row; > > >@@ -601,8 +597,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 1 May 2008 08:13:19 -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 "") { >@@ -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_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 1 May 2008 08:13:19 -0000 >@@ -114,11 +114,11 @@ > #} > #$::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", >- "devel_whiteboard","qa_whiteboard","bug_file_loc","changeddate","internal_whiteboard"); >+ "cf_devel_whiteboard","cf_qa_whiteboard","bug_file_loc","changeddate","cf_internal_whiteboard"); > > @::test_types = qw(SYSTEM AUDIO CDROM CORE FLOPPY INFO MEMORY NETWORK SOCKET STORAGE TAPE USB VIDEO Z90CRYPT > MEMORY2 NETWORK2 STORAGE2 CORE2 BATTERY LID SUSPEND); >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 1 May 2008 08:13:19 -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("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_fixed_in" , "bugs.cf_fixed_in" , "Fixed In" ); >+DefineColumn("cf_cust_facing" , "bugs.cf_cust_facing" , "Customer Facing" ); >+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" ); >@@ -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++; >@@ -384,8 +384,8 @@ > # $chart_count++; > # } > #} >-if ($params->param('cust_facing')) { >- $params->param(-name=>"field0-1-0", -value=>'cust_facing'); >+if ($params->param('cf_cust_facing')) { >+ $params->param(-name=>"field0-1-0", -value=>'cf_cust_facing'); > $params->param(-name=>"type0-1-0", -value=>'equals'); > $params->param(-name=>"value0-1-0", -value=>'1'); > } >@@ -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); > >@@ -470,8 +470,8 @@ > @displaycolumns = grep($_ ne 'relevance', @displaycolumns); > # } > >-if ($params->param("cust_facing") && UserInGroup("hwcert_edit")) { >- push(@displaycolumns, "cust_facing"); >+if ($params->param("cf_cust_facing") && UserInGroup("hwcert_edit")) { >+ push(@displaycolumns, "cf_cust_facing"); > } > > ################################################################################ >@@ -483,7 +483,7 @@ > # 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 >@@ -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: post.cgi >=================================================================== >RCS file: /cvs/qa/hwcert/post.cgi,v >retrieving revision 1.53 >diff -u -r1.53 post.cgi >--- post.cgi 6 Feb 2008 21:31:40 -0000 1.53 >+++ post.cgi 1 May 2008 08:13:19 -0000 >@@ -101,7 +101,7 @@ > $logger->debug("starting"); > > my $cgi = Bugzilla->cgi; >-my $cert_type = $::FORM{'internal_whiteboard'}; >+my $cert_type = $::FORM{'cf_internal_whiteboard'}; > > $logger->debug("CGI input parameters: $::buffer"); > >@@ -109,7 +109,7 @@ > > if ($cgi->param('md5') || $cgi->upload('data') || $cgi->param('dup_id') || $cgi->param('Not_Provided_Pkg') ) { > if ($cgi->upload('data') && $cgi->param('status_whiteboard') && >- $cgi->param('qa_whiteboard')) { >+ $cgi->param('cf_qa_whiteboard')) { > ThrowUserError("Create_certification_conflict_error"); > } > >@@ -183,7 +183,7 @@ > > # gather make and model information from hidden values > $make = $cgi->param('status_whiteboard'); >- $model = $cgi->param('qa_whiteboard'); >+ $model = $cgi->param('cf_qa_whiteboard'); > > # get attachment data from hidden values > $filename = $cgi->param('filename'); >@@ -194,10 +194,10 @@ > ThrowCodeError( "system_error", { syserror => "Filename or temp filename not passed correctly from previous page" }); > } > } elsif ($cgi->param('dup_id')){ >- $vendor = $cgi->param('devel_whiteboard'); >- $::FORM{'devel_whiteboard'} = "$vendor"; >+ $vendor = $cgi->param('cf_devel_whiteboard'); >+ $::FORM{'cf_devel_whiteboard'} = "$vendor"; > $make = $cgi->param('status_whiteboard'); >- $model = $cgi->param('qa_whiteboard'); >+ $model = $cgi->param('cf_qa_whiteboard'); > $platform = $cgi->param('rep_platform'); > $resolution = 'DUPLICATE'; > $::FORM{'resolution'} = "$resolution"; >@@ -205,9 +205,9 @@ > detaint_natural($dup_id); > $::FORM{'dup_id'} = "$dup_id"; > } elsif ( $cgi->param('Not_Provided_Pkg') ) { >- $vendor = $cgi->param('devel_whiteboard'); >+ $vendor = $cgi->param('cf_devel_whiteboard'); > $make = $cgi->param('status_whiteboard'); >- $model = $cgi->param('qa_whiteboard'); >+ $model = $cgi->param('cf_qa_whiteboard'); > $version = $cgi->param('version'); > $platform = $cgi->param('platform'); > } else { >@@ -288,9 +288,9 @@ > $vars->{'product'} = $cgi->param('product'); > $vars->{'component_'} = $cgi->param('component'); > $vars->{'version'} = $version; >- $vars->{'devel_whiteboard'} = $cgi->param('devel_whiteboard'); >- $vars->{'internal_whiteboard'} = $cgi->param('internal_whiteboard'); >- $vars->{'qa_whiteboard'} = $model; >+ $vars->{'cf_devel_whiteboard'} = $cgi->param('cf_devel_whiteboard'); >+ $vars->{'cf_internal_whiteboard'} = $cgi->param('cf_internal_whiteboard'); >+ $vars->{'cf_qa_whiteboard'} = $model; > $vars->{'status_whiteboard'} = $make; > $vars->{'bug_file_loc'} = $cgi->param('bug_file_loc'); > $vars->{'filename'} = $filename; >@@ -376,10 +376,10 @@ > # Prefilled form variables > $vars->{'product'} = $cgi->param('product'); > $vars->{'component_'} = $cgi->param('component'); >- $vars->{'devel_whiteboard'} = $vendor; >- $vars->{'internal_whiteboard'} = $cgi->param('internal_whiteboard'); >+ $vars->{'cf_devel_whiteboard'} = $vendor; >+ $vars->{'cf_internal_whiteboard'} = $cgi->param('cf_internal_whiteboard'); > $vars->{'status_whiteboard'} = $make; >- $vars->{'qa_whiteboard'} = $model; >+ $vars->{'cf_qa_whiteboard'} = $model; > $vars->{'bug_file_loc'} = $cgi->param('bug_file_loc'); > $vars->{'version'} = $version; > $vars->{'kernelver'} = "Provided by Package"; >@@ -438,7 +438,7 @@ > if ($make && $model) { > $::FORM{'short_desc'} = "HWCERT: $make $model"; > $::FORM{'status_whiteboard'} = "$make"; >- $::FORM{'qa_whiteboard'} = "$model"; >+ $::FORM{'cf_qa_whiteboard'} = "$model"; > } else { > ThrowCodeError("system_error", { syserror => "Make or model not found in system.conf" }); > } >@@ -451,9 +451,9 @@ > Product: $::FORM{'component'} > Version: $::FORM{'version'} > Make: $::FORM{'status_whiteboard'} >-Model: $::FORM{'qa_whiteboard'} >-Vendor: $::FORM{'devel_whiteboard'} >-Category: $::FORM{'internal_whiteboard'} >+Model: $::FORM{'cf_qa_whiteboard'} >+Vendor: $::FORM{'cf_devel_whiteboard'} >+Category: $::FORM{'cf_internal_whiteboard'} > Reporter: $::COOKIE{'Bugzilla_login'} > }; > >@@ -537,8 +537,8 @@ > "bug_severity", "priority", "op_sys", > "assigned_to", "bug_status", > "short_desc", "status_whiteboard", >- "qa_whiteboard", "devel_whiteboard", >- "internal_whiteboard", "resolution"); >+ "cf_qa_whiteboard", "cf_devel_whiteboard", >+ "cf_internal_whiteboard", "resolution"); > > if (Param("useqacontact")) { > # Find the qa contact based on vendor first. >@@ -588,8 +588,8 @@ > CheckFormField(\%::FORM, 'target_milestone', $::target_milestone{$product}); > CheckFormFieldDefined(\%::FORM, 'assigned_to'); > CheckFormFieldDefined(\%::FORM, 'bug_file_loc', 'URL'); >-CheckFormFieldDefined(\%::FORM, 'devel_whiteboard', 'Vendor'); >-CheckFormFieldDefined(\%::FORM, 'internal_whiteboard', 'Category'); >+CheckFormFieldDefined(\%::FORM, 'cf_devel_whiteboard', 'Vendor'); >+CheckFormFieldDefined(\%::FORM, 'cf_internal_whiteboard', 'Category'); > > > my @used_fields; >Index: process.cgi >=================================================================== >RCS file: /cvs/qa/hwcert/process.cgi,v >retrieving revision 1.28 >diff -u -r1.28 process.cgi >--- process.cgi 29 Feb 2008 11:58:23 -0000 1.28 >+++ process.cgi 1 May 2008 08:13:19 -0000 >@@ -666,11 +666,11 @@ > } > > foreach my $field ("rep_platform", "priority", "bug_severity", "summary", "bug_file_loc", >- "short_desc", "version", "op_sys", "fixed_in", "target_milestone", >- "status_whiteboard", "qa_whiteboard", "devel_whiteboard", >- "internal_whiteboard", "cust_facing") { >- if ($field eq "cust_facing") { >- if (!defined $::FORM{'cust_facing'} || !$::FORM{'cust_facing'}) { >+ "short_desc", "version", "op_sys", "cf_fixed_in", "target_milestone", >+ "status_whiteboard", "cf_qa_whiteboard", "cf_devel_whiteboard", >+ "cf_internal_whiteboard", "cf_cust_facing") { >+ if ($field eq "cf_cust_facing") { >+ if (!defined $::FORM{'cf_cust_facing'} || !$::FORM{'cf_cust_facing'}) { > DoComma(); > $::query .= "$field = '0'"; > } else { >Index: query.cgi >=================================================================== >RCS file: /cvs/qa/hwcert/query.cgi,v >retrieving revision 1.6 >diff -u -r1.6 query.cgi >--- query.cgi 13 Sep 2007 17:25:16 -0000 1.6 >+++ query.cgi 1 May 2008 08:13:19 -0000 >@@ -242,15 +242,15 @@ > $default{version} = []; > @{$default{version}} = $cgi->param('version') || '5'; > $default{vendor} = []; >-@{$default{vendor}} = $cgi->param('devel_whiteboard'); >+@{$default{vendor}} = $cgi->param('cf_devel_whiteboard'); > > # Categories > $vars->{categories} = ["Server", "Desktop/Workstation", "Laptop", "Component/Peripheral"]; > $default{category} = []; >-@{$default{category}} = $cgi->param('internal_whiteboard') || "Server"; >+@{$default{category}} = $cgi->param('cf_internal_whiteboard') || "Server"; > > $default{make} = $cgi->param('status_whiteboard'); >-$default{model} = $cgi->param('qa_whiteboard'); >+$default{model} = $cgi->param('cf_qa_whiteboard'); > $default{long_desc} = $cgi->param('long_desc'); > > $vars->{rep_platform} = \@::legal_platform; >@@ -259,11 +259,11 @@ > > # Vendors > my @vendors; >-SendSQL("SELECT DISTINCT devel_whiteboard >+SendSQL("SELECT DISTINCT cf_devel_whiteboard > FROM bugs LEFT JOIN bug_group_map ON bug_group_map.bug_id=bugs.bug_id > WHERE bug_status = 'CLOSED' AND product_id = '58' AND group_id IS NULL >- AND devel_whiteboard IS NOT NULL and devel_whiteboard != '' >- ORDER BY devel_whiteboard"); >+ AND cf_devel_whiteboard IS NOT NULL and cf_devel_whiteboard != '' >+ ORDER BY cf_devel_whiteboard"); > while (MoreSQLData()) { > push (@vendors, FetchOneColumn()); > } >Index: hwcert.pl >=================================================================== >RCS file: /cvs/qa/hwcert/hwcert.pl,v >retrieving revision 1.49 >diff -u -r1.49 hwcert.pl >--- hwcert.pl 29 Feb 2008 11:54:40 -0000 1.49 >+++ hwcert.pl 1 May 2008 08:13:19 -0000 >@@ -338,8 +338,8 @@ > my $bug = new Bugzilla::Bug($id, $userid); > ThrowCodeError("bug_error", { bug => $bug }) if $bug->error; > >- my $exception = $bug->cust_facing; >- my $fixed_in = $bug->fixed_in; >+ my $exception = $bug->cf_cust_facing; >+ my $cf_fixed_in = $bug->cf_fixed_in; > $supported = $supported ? "true" : "false"; > $type = $type ? $type : "SYSTEM"; > >@@ -485,7 +485,7 @@ > Status: CLOSED > Resolution: $resolution > Type: $type >-Release: $fixed_in >+Release: $cf_fixed_in > Supported: $supported > }; > >Index: certify.cgi >=================================================================== >RCS file: /cvs/qa/hwcert/certify.cgi,v >retrieving revision 1.6 >diff -u -r1.6 certify.cgi >--- certify.cgi 8 Jun 2005 18:05:55 -0000 1.6 >+++ certify.cgi 1 May 2008 08:13:19 -0000 >@@ -27,9 +27,9 @@ > my $type = $cgi->param('type') || ''; > my $exception = $cgi->param('exception'); > my $reason = $cgi->param('exception_reason'); >-my $fixed_in = $cgi->param('fixed_in'); >+my $cf_fixed_in = $cgi->param('cf_fixed_in'); > >-CertifySystem($id, $component, $type, $fixed_in, $exception, $reason); >+CertifySystem($id, $component, $type, $cf_fixed_in, $exception, $reason); > > print $cgi->redirect("show.cgi?id=$id"); > >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 1 May 2008 08:13:19 -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 1 May 2008 08:13:19 -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" %] > > <!-- browse by START --> > <h2 class="accentLightWide"><span>Browse Red Hat Enterprise Linux Certified Hardware</span></h2> >Index: template/en/default/search/form_advanced.html.tmpl >=================================================================== >RCS file: /cvs/qa/hwcert/template/en/default/search/form_advanced.html.tmpl,v >retrieving revision 1.20 >diff -u -r1.20 form_advanced.html.tmpl >--- template/en/default/search/form_advanced.html.tmpl 13 Sep 2007 17:34:13 -0000 1.20 >+++ template/en/default/search/form_advanced.html.tmpl 1 May 2008 08:13:19 -0000 >@@ -51,7 +51,7 @@ > <tr> > <th>Vendor</th> > <td> >- <select NAME="devel_whiteboard" multiple="multiple" size="4"> >+ <select NAME="cf_devel_whiteboard" multiple="multiple" size="4"> > [% FOREACH vendor = vendors %] > <option value="[% vendor FILTER html %]" > [% "selected" IF lsearch(default.vendor, vendor) != -1 %]> >@@ -75,7 +75,7 @@ > <tr> > <th>Category</th> > <td> >- <select name="internal_whiteboard" id="internal_whiteboard" size="4" multiple="multiple"> >+ <select name="cf_internal_whiteboard" id="cf_internal_whiteboard" size="4" multiple="multiple"> > [% FOREACH c = categories %] > <option value="[% c FILTER html %]" > [% "selected" IF lsearch(default.category, c) != -1 %]>[% c FILTER html %]</option> >@@ -105,7 +105,7 @@ > <tr> > <th>Certified with exception</th> > <td> >- <input type="checkbox" name="cust_facing" value="1"> >+ <input type="checkbox" name="cf_cust_facing" value="1"> > </td> > </tr> > <tr> >Index: template/en/default/bug/create/post_verify.html.tmpl >=================================================================== >RCS file: /cvs/qa/hwcert/template/en/default/bug/create/post_verify.html.tmpl,v >retrieving revision 1.11 >diff -u -r1.11 post_verify.html.tmpl >--- template/en/default/bug/create/post_verify.html.tmpl 23 Jul 2007 17:04:22 -0000 1.11 >+++ template/en/default/bug/create/post_verify.html.tmpl 1 May 2008 08:13:19 -0000 >@@ -45,9 +45,9 @@ > <input type="hidden" name="component" value="[% component_ FILTER html %]"/> > <input type="hidden" name="version" value="[% version FILTER html %]"/> > <input type="hidden" name="status_whiteboard" value="[% status_whiteboard FILTER html %]"/> >- <input type="hidden" name="qa_whiteboard" value="[% qa_whiteboard FILTER html %]"/> >- <input type="hidden" name="devel_whiteboard" value="[% devel_whiteboard FILTER html %]"/> >- <input type="hidden" name="internal_whiteboard" value="[% internal_whiteboard FILTER html %]"/> >+ <input type="hidden" name="cf_qa_whiteboard" value="[% cf_qa_whiteboard FILTER html %]"/> >+ <input type="hidden" name="cf_devel_whiteboard" value="[% cf_devel_whiteboard FILTER html %]"/> >+ <input type="hidden" name="cf_internal_whiteboard" value="[% cf_internal_whiteboard FILTER html %]"/> > <input type="hidden" name="bug_file_loc" value="[% bug_file_loc FILTER html %]"/> > <input type="hidden" name="md5" value="[% md5 FILTER html %]"/> > <input type="hidden" name="filename" value="[% filename FILTER html %]"/> >@@ -80,7 +80,7 @@ > Category > </th> > <td> >- [% internal_whiteboard FILTER html %] >+ [% cf_internal_whiteboard FILTER html %] > </td> > </tr> > >@@ -106,7 +106,7 @@ > Vendor > </th> > <td> >- [% devel_whiteboard FILTER html %] >+ [% cf_devel_whiteboard FILTER html %] > </td> > <th> > Reporter >@@ -127,7 +127,7 @@ > Model > </th> > <td> >- [% qa_whiteboard FILTER html %] >+ [% cf_qa_whiteboard FILTER html %] > </td> > </tr> > >Index: template/en/default/bug/create/create.html.tmpl >=================================================================== >RCS file: /cvs/qa/hwcert/template/en/default/bug/create/create.html.tmpl,v >retrieving revision 1.13 >diff -u -r1.13 create.html.tmpl >--- template/en/default/bug/create/create.html.tmpl 23 Jul 2007 17:04:22 -0000 1.13 >+++ template/en/default/bug/create/create.html.tmpl 1 May 2008 08:13:19 -0000 >@@ -67,7 +67,7 @@ > Vendor > </th> > <td> >- <select name="devel_whiteboard" size="1"> >+ <select name="cf_devel_whiteboard" size="1"> > [%- FOREACH v = vendors %] > <option value="[% v FILTER html %]" > [% " selected=\"selected\"" IF v == default.vendor %]>[% v FILTER html -%] >@@ -83,7 +83,7 @@ > </th> > <td> > [% vendors.0 FILTER html %] >- <input type="hidden" name="devel_whiteboard" value="[% vendors.0 FILTER html %]"> >+ <input type="hidden" name="cf_devel_whiteboard" value="[% vendors.0 FILTER html %]"> > </td> > </tr> > [% END %] >@@ -92,7 +92,7 @@ > Category > </th> > <td> >- <select name="internal_whiteboard" size="1"> >+ <select name="cf_internal_whiteboard" size="1"> > [%- FOREACH c = categories %] > <option value="[% c FILTER html %]" > [% " selected=\"selected\"" IF c == default.category %]>[% c FILTER html -%] >@@ -113,8 +113,8 @@ > <tr> > <th>Product Data Source</th> > <br> >- <td><input type=radio name=package_upload value=0 checked onchange="if(this.checked) {status_whiteboard.disabled=true;qa_whiteboard.disabled=true;Not_Provided_Pkg.disabled=true;data.disabled=false;version.disabled=true;platform.disabled=true;} else{status_whiteboard.disabled=false;qa_whiteboard.disabled=false;Not_Provided_Pkg.disabled=false;data.disabled=true;version.disabled=false;platform.disabled=false;}">Aquire from Package</input><br> >- <input type=radio name=package_upload value=1 onchange="if(this.checked) {status_whiteboard.disabled=false;qa_whiteboard.disabled=false;Not_Provided_Pkg.disabled=false;data.disabled=true;version.disabled=false;platform.disabled=false;} else{status_whiteboard.disabled=true;qa_whiteboard.disabled=true;Not_Provided_Pkg.disabled=true;data.disabled=false;version.disabled=true;platform.disabled=true;}">Provide Manually</input></td> >+ <td><input type=radio name=package_upload value=0 checked onchange="if(this.checked) {status_whiteboard.disabled=true;cf_qa_whiteboard.disabled=true;Not_Provided_Pkg.disabled=true;data.disabled=false;version.disabled=true;platform.disabled=true;} else{status_whiteboard.disabled=false;cf_qa_whiteboard.disabled=false;Not_Provided_Pkg.disabled=false;data.disabled=true;version.disabled=false;platform.disabled=false;}">Aquire from Package</input><br> >+ <input type=radio name=package_upload value=1 onchange="if(this.checked) {status_whiteboard.disabled=false;cf_qa_whiteboard.disabled=false;Not_Provided_Pkg.disabled=false;data.disabled=true;version.disabled=false;platform.disabled=false;} else{status_whiteboard.disabled=true;cf_qa_whiteboard.disabled=true;Not_Provided_Pkg.disabled=true;data.disabled=false;version.disabled=true;platform.disabled=true;}">Provide Manually</input></td> > </tr> > </table> > </p> >@@ -131,7 +131,7 @@ > </tr> > <tr> > <th>Insert Model</th> >- <td><input type=text name=qa_whiteboard size=40 disabled value="Provided by Package"></td> >+ <td><input type=text name=cf_qa_whiteboard size=40 disabled value="Provided by Package"></td> > </tr> > <tr> > <th>Version</th> >Index: ./template/en/default/bug/clone.html.tmpl >=================================================================== >RCS file: /cvs/qa/hwcert/template/en/default/bug/clone.html.tmpl,v >retrieving revision 1.4 >diff -u -r1.4 clone.html.tmpl >--- ./template/en/default/bug/clone.html.tmpl 3 Aug 2007 02:54:57 -0000 1.4 >+++ ./template/en/default/bug/clone.html.tmpl 1 May 2008 08:13:19 -0000 >@@ -6,7 +6,7 @@ > > <input type="hidden" name="dup_id" value="[% bug.bug_id %]"> > >- <input type="hidden" name="internal_whiteboard" value="[% bug.internal_whiteboard FILTER html %]"> >+ <input type="hidden" name="cf_internal_whiteboard" value="[% bug.cf_internal_whiteboard FILTER html %]"> > > <input type="hidden" name="delta_ts" value="[% bug.delta_ts FILTER html %]"> > <input type="hidden" name="product" value="Red Hat Hardware Certification"> >@@ -35,8 +35,8 @@ > <input type="hidden" name="knob" value="none"> > [% END %] > >- [% IF bug.fixed_in %] >- <input type="hidden" name="fixed_in" value="[% bug.fixed_in FILTER html %]"> >+ [% IF bug.cf_fixed_in %] >+ <input type="hidden" name="cf_fixed_in" value="[% bug.cf_fixed_in FILTER html %]"> > [% END %] > > >@@ -47,7 +47,7 @@ > Vendor > </th> > <td> >- <input type="text" size="30" maxsize="100" name="devel_whiteboard" value="[% bug.devel_whiteboard FILTER html %]"> >+ <input type="text" size="30" maxsize="100" name="cf_devel_whiteboard" value="[% bug.cf_devel_whiteboard FILTER html %]"> > </td> > <th> > Make >@@ -61,7 +61,7 @@ > Model > </th> > <td> >- <input type="text" size="30" maxsize="100" name="qa_whiteboard" value="[% bug.qa_whiteboard FILTER html %] Clone"> >+ <input type="text" size="30" maxsize="100" name="cf_qa_whiteboard" value="[% bug.cf_qa_whiteboard FILTER html %] Clone"> > </td> > <th> > URL >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 1 May 2008 08:13:19 -0000 >@@ -41,7 +41,7 @@ > # We'll need to revisit when we figure out what we really want to do. > --- #%] > [% canclone = 0 %] >- [% SET canclone = 1 IF ( bug.devel_whiteboard.match('Intel') && >+ [% SET canclone = 1 IF ( bug.cf_devel_whiteboard.match('Intel') && > UserInGroup('intel') && > UserInGroup('hwcertpassthru') ) || > UserInGroup('hwcert_edit') %] >@@ -49,7 +49,7 @@ > [% isduplicate = bug.bug_status == 'CLOSED' && bug.resolution == 'DUPLICATE' %] > > >- [% IF bug.internal_whiteboard == 'Component/Peripheral' %] >+ [% IF bug.cf_internal_whiteboard == 'Component/Peripheral' %] > [% PROCESS bug/component_warning.html.tmpl %] > [% END %] > >Index: ./template/en/default/bug/summary.html.tmpl >=================================================================== >RCS file: /cvs/qa/hwcert/template/en/default/bug/summary.html.tmpl,v >retrieving revision 1.1 >diff -u -r1.1 summary.html.tmpl >--- ./template/en/default/bug/summary.html.tmpl 11 Feb 2008 23:11:03 -0000 1.1 >+++ ./template/en/default/bug/summary.html.tmpl 1 May 2008 08:13:19 -0000 >@@ -14,31 +14,31 @@ > <th> > Version > [% IF isduplicate && canedit && >- ( bug.version != bug.dup_info.version || bug.fixed_in != bug.dup_info.fixed_in ) %] >+ ( bug.version != bug.dup_info.version || bug.cf_fixed_in != bug.dup_info.cf_fixed_in ) %] > <font color="red">(corrected)</font> > [% END %] > </th> > <td> > [% IF canedit %] > [% IF isduplicate %] >- [% IF bug.dup_info.fixed_in != bug.fixed_in %] >- <s>[% bug.fixed_in FILTER html %]</s> [% bug.dup_info.fixed_in FILTER html %] >+ [% IF bug.dup_info.cf_fixed_in != bug.cf_fixed_in %] >+ <s>[% bug.cf_fixed_in FILTER html %]</s> [% bug.dup_info.cf_fixed_in FILTER html %] > <br>(saving changes will save corrected version) >- [%# Cludgy; but to change the default for fixed_in is is rh_edit.html.tmpl #%] >+ [%# Cludgy; but to change the default for cf_fixed_in is is rh_edit.html.tmpl #%] > [% ELSIF bug.dup_info.version != bug.version %] > <s>[% bug.version FILTER html %]</s> RHEL [% bug.dup_info.version FILTER html %] > <br>(saving changes will save corrected version) > [% ELSE %] >- [% IF bug.dup_info.fixed_in %] >- [% bug.dup_info.fixed_in FILTER html %] >+ [% IF bug.dup_info.cf_fixed_in %] >+ [% bug.dup_info.cf_fixed_in FILTER html %] > [% ELSE %] > RHEL [% bug.dup_info.version FILTER html %] > [% END %] > [% END %] > <input type="hidden" name="version" value="[% bug.dup_info.version FILTER html %]"> > [% ELSE %] >- [% IF bug.fixed_in %] >- [% bug.fixed_in FILTER html %] >+ [% IF bug.cf_fixed_in %] >+ [% bug.cf_fixed_in FILTER html %] > [% ELSE %] > RHEL [% bug.version FILTER html %] > [% END %] >@@ -46,14 +46,14 @@ > [% END %] > [% ELSE %] > [% IF isduplicate %] >- [% IF bug.dup_info.fixed_in %] >- [% bug.dup_info.fixed_in FILTER html %] >+ [% IF bug.dup_info.cf_fixed_in %] >+ [% bug.dup_info.cf_fixed_in FILTER html %] > [% ELSE %] > RHEL [% bug.dup_info.version FILTER html %] > [% END %] > [% ELSE %] >- [% IF bug.fixed_in %] >- [% bug.fixed_in FILTER html %] >+ [% IF bug.cf_fixed_in %] >+ [% bug.cf_fixed_in FILTER html %] > [% ELSE %] > RHEL [% bug.version FILTER html %] > [% END %] >@@ -69,18 +69,18 @@ > <td> > [% IF canedit %] > <label for="category" accesskey="c"> >- <select name="internal_whiteboard" id="category"> >+ <select name="cf_internal_whiteboard" id="category"> > [% FOREACH x = ["Server", "Desktop/Workstation", "Laptop", "Component/Peripheral"] %] > <option value="[% x FILTER html %]" >- [% " selected" IF x == bug.internal_whiteboard %]>[% x FILTER html %] >+ [% " selected" IF x == bug.cf_internal_whiteboard %]>[% x FILTER html %] > </option> > [% END %] > </select> > </label> > [% ELSE %] >- [% bug.internal_whiteboard FILTER html %] >+ [% bug.cf_internal_whiteboard FILTER html %] > [% END %] >- [% IF bug.internal_whiteboard == 'Component/Peripheral' %] >+ [% IF bug.cf_internal_whiteboard == 'Component/Peripheral' %] > ([% bug.cert_type FILTER html %]) > [% END %] > </td> >@@ -130,9 +130,9 @@ > </th> > <td> > [% IF canedit && ( template_status != 'CLOSED' || isduplicate ) %] >- <input type="text" size="30" maxsize="100" name="devel_whiteboard" value="[% bug.devel_whiteboard FILTER html %]"> >+ <input type="text" size="30" maxsize="100" name="cf_devel_whiteboard" value="[% bug.cf_devel_whiteboard FILTER html %]"> > [% ELSE %] >- [% bug.devel_whiteboard FILTER html %] >+ [% bug.cf_devel_whiteboard FILTER html %] > [% END %] > </td> > <th> >@@ -172,9 +172,9 @@ > </th> > <td> > [% IF canedit && ( template_status != 'CLOSED' || isduplicate ) %] >- <input type="text" size="30" maxsize="100" name="qa_whiteboard" value="[% bug.qa_whiteboard FILTER html %]"> >+ <input type="text" size="30" maxsize="100" name="cf_qa_whiteboard" value="[% bug.cf_qa_whiteboard FILTER html %]"> > [% ELSE %] >- [% bug.qa_whiteboard FILTER html %] >+ [% bug.cf_qa_whiteboard FILTER html %] > [% END %] > </td> > </tr> >Index: template/en/default/bug/tam_ack.html.tmpl >=================================================================== >RCS file: /cvs/qa/hwcert/template/en/default/bug/tam_ack.html.tmpl,v >retrieving revision 1.2 >diff -u -r1.2 tam_ack.html.tmpl >--- template/en/default/bug/tam_ack.html.tmpl 29 Feb 2008 12:13:41 -0000 1.2 >+++ template/en/default/bug/tam_ack.html.tmpl 1 May 2008 08:13:19 -0000 >@@ -155,7 +155,7 @@ > } > shippingTextBox(); > function exceptionTextBox() { >- if (document.changeform.cust_facing.checked) { >+ if (document.changeform.cf_cust_facing.checked) { > document.changeform.exception_reason.disabled = false; > } else { > document.changeform.exception_reason.disabled = true; >Index: template/en/default/bug/rh_edit.html.tmpl >=================================================================== >RCS file: /cvs/qa/hwcert/template/en/default/bug/rh_edit.html.tmpl,v >retrieving revision 1.17 >diff -u -r1.17 rh_edit.html.tmpl >--- template/en/default/bug/rh_edit.html.tmpl 29 Feb 2008 12:12:29 -0000 1.17 >+++ template/en/default/bug/rh_edit.html.tmpl 1 May 2008 08:13:19 -0000 >@@ -19,19 +19,19 @@ > <th>Release certified against</td> > <td> > [% IF errata_groups.size > 0 %] >- <select name="fixed_in"> >+ <select name="cf_fixed_in"> > <option value="">---</option> >- [% IF bug.dup_info.fixed_in %] >- [% fixedin = bug.dup_info.fixed_in %] >+ [% IF bug.dup_info.cf_fixed_in %] >+ [% cf_fixedin = bug.dup_info.cf_fixed_in %] > [% ELSE %] >- [% fixedin = bug.fixed_in %] >+ [% cf_fixedin = bug.cf_fixed_in %] > [% END %] > [% FOREACH eg = errata_groups %] >- <option value="[% eg FILTER html %]" [% "SELECTED" IF eg == fixedin %]>[% eg FILTER html %]</option> >+ <option value="[% eg FILTER html %]" [% "SELECTED" IF eg == cf_fixedin %]>[% eg FILTER html %]</option> > [% END %] > </select> > [% ELSE %] >- <input type="text" name="fixed_in" value="[% bug.fixed_in FILTER html %]" size="20"> Ex: RHEL4-GA, RHEL4-U1, RHEL3-U5, etc. >+ <input type="text" name="cf_fixed_in" value="[% bug.cf_fixed_in FILTER html %]" size="20"> Ex: RHEL4-GA, RHEL4-U1, RHEL3-U5, etc. > [% END %] > </td> > </tr> >@@ -56,7 +56,7 @@ > </tr><tr> > <th>Certifying with exception</th> > <td> >- <input type="checkbox" name="cust_facing" value="1" [% "CHECKED" IF bug.cust_facing == 1 %] onchange="exceptionTextBox();"> >+ <input type="checkbox" name="cf_cust_facing" value="1" [% "CHECKED" IF bug.cf_cust_facing == 1 %] onchange="exceptionTextBox();"> > </td> > </tr><tr> > <th>Exception Reason</th> >Index: template/en/default/bug/knob.html.tmpl >=================================================================== >RCS file: /cvs/qa/hwcert/template/en/default/bug/knob.html.tmpl,v >retrieving revision 1.1.1.1 >diff -u -r1.1.1.1 knob.html.tmpl >--- template/en/default/bug/knob.html.tmpl 16 Nov 2004 16:42:37 -0000 1.1.1.1 >+++ template/en/default/bug/knob.html.tmpl 1 May 2008 08:13:19 -0000 >@@ -167,19 +167,19 @@ > <br> > [% IF knobproducts.size == 1 %] > Fixed in version >- <input name="fixed_in" size="10" maxsize="20" value="[% (onebug ? bug.fixed_in : "") FILTER html %]"> >+ <input name="cf_fixed_in" size="10" maxsize="20" value="[% (onebug ? bug.cf_fixed_in : "") FILTER html %]"> > (optional) > <br> > <script type="text/javascript" language="JavaScript"> <!-- > function fixedInTextBox () { > if (document.changeform.resolution.value == 'CURRENTRELEASE') { >- document.changeform.fixed_in.disabled = false; >+ document.changeform.cf_fixed_in.disabled = false; > } else if (document.changeform.resolution.value == 'RAWHIDE') { >- document.changeform.fixed_in.disabled = false; >+ document.changeform.cf_fixed_in.disabled = false; > } else if (document.changeform.resolution.value == 'ERRATA') { >- document.changeform.fixed_in.disabled = false; >+ document.changeform.cf_fixed_in.disabled = false; > } else { >- document.changeform.fixed_in.disabled = true; >+ document.changeform.cf_fixed_in.disabled = true; > } > } > fixedInTextBox(); >Index: template/en/default/bug/show.html.tmpl >=================================================================== >RCS file: /cvs/qa/hwcert/template/en/default/bug/show.html.tmpl,v >retrieving revision 1.8 >diff -u -r1.8 show.html.tmpl >--- template/en/default/bug/show.html.tmpl 22 Feb 2008 21:56:00 -0000 1.8 >+++ template/en/default/bug/show.html.tmpl 1 May 2008 08:13:19 -0000 >@@ -26,7 +26,7 @@ > [%# This script/template only handles one bug #%] > [% bug = bugs.0 %] > >-[% filtered_desc = "$bug.status_whiteboard $bug.qa_whiteboard" FILTER html %] >+[% filtered_desc = "$bug.status_whiteboard $bug.cf_qa_whiteboard" FILTER html %] > [% filtered_timestamp = bug.delta_ts FILTER time %] > [% bodyattrs = BLOCK %]class='bz_bug bz_status_[% bug.bug_status > FILTER css_class_quote %] bz_component_[% bug.component
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=304300">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 443461
:
303408
|
303768
|
304089
| 304300