Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 294706 Details for
Bug 406151
3.5: Additional Red Hat specific whiteboard bug fields.whiteboards (qa,devel,internal) and the access restrictions for those.
[?]
New
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.rh83 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]
Patch to add devel,qa,internal, and fixed in whiteboard fields (v2)
extra_whiteboard_fixed_in.patch (text/plain), 32.84 KB, created by
David Lawrence
on 2008-02-12 22:20:39 UTC
(
hide
)
Description:
Patch to add devel,qa,internal, and fixed in whiteboard fields (v2)
Filename:
MIME Type:
Creator:
David Lawrence
Created:
2008-02-12 22:20:39 UTC
Size:
32.84 KB
patch
obsolete
>Index: buglist.cgi >=================================================================== >RCS file: /cvs/qa/rh_bugzilla_3/buglist.cgi,v >retrieving revision 1.4 >diff -u -r1.4 buglist.cgi >--- buglist.cgi 11 Feb 2008 03:21:01 -0000 1.4 >+++ buglist.cgi 12 Feb 2008 22:14:05 -0000 >@@ -651,6 +651,12 @@ > DefineColumn("short_short_desc" , "bugs.short_desc" , "Summary" ); > DefineColumn("short_desc" , "bugs.short_desc" , "Summary" ); > DefineColumn("status_whiteboard" , "bugs.status_whiteboard" , "Whiteboard" ); >+# REDHAT EXTENSION START 406151 >+DefineColumn("devel_whiteboard" , "bugs.devel_whiteboard" , "Devel Whiteboard" ); >+DefineColumn("qa_whiteboard" , "bugs.qa_whiteboard" , "QA Whiteboard" ); >+DefineColumn("internal_whiteboard" , "bugs.internal_whiteboard" , "Internal Whiteboard"); >+DefineColumn("fixed_in" , "bugs.fixed_in" , "Fixed In" ); >+# REDHAT EXTENSION END 406151 > DefineColumn("component" , "map_components.name" , "Component" ); > DefineColumn("product" , "map_products.name" , "Product" ); > DefineColumn("classification" , "map_classifications.name" , "Classification" ); >Index: colchange.cgi >=================================================================== >RCS file: /cvs/qa/rh_bugzilla_3/colchange.cgi,v >retrieving revision 1.1.1.1 >diff -u -r1.1.1.1 colchange.cgi >--- colchange.cgi 19 Nov 2007 22:11:21 -0000 1.1.1.1 >+++ colchange.cgi 12 Feb 2008 22:14:05 -0000 >@@ -51,7 +51,9 @@ > push(@masterlist, "classification"); > } > >-push(@masterlist, ("product", "component", "version", "op_sys")); >+# REDHAT EXTENSION START 406151 >+push(@masterlist, ("product", "component", "version", "op_sys", "fixed_in")); >+# REDHAT EXTENSION END 406151 > > if (Bugzilla->params->{"usevotes"}) { > push (@masterlist, "votes"); >@@ -69,6 +71,17 @@ > if (Bugzilla->params->{"usestatuswhiteboard"}) { > push(@masterlist, "status_whiteboard"); > } >+# REDHAT EXTENSION START 406151 >+if (Bugzilla->user->in_group('devel')) { >+ push(@masterlist, "devel_whiteboard"); >+} >+if (Bugzilla->user->in_group('qa')) { >+ push(@masterlist, "qa_whiteboard"); >+} >+if (Bugzilla->user->in_group('internalwhiteboard')) { >+ push(@masterlist, "internal_whiteboard"); >+} >+# REDHAT EXTENSION END 406151 > if (Bugzilla::Keyword::keyword_count()) { > push(@masterlist, "keywords"); > } >Index: enter_bug.cgi >=================================================================== >RCS file: /cvs/qa/rh_bugzilla_3/enter_bug.cgi,v >retrieving revision 1.1.1.1 >diff -u -r1.1.1.1 enter_bug.cgi >--- enter_bug.cgi 19 Nov 2007 22:11:21 -0000 1.1.1.1 >+++ enter_bug.cgi 12 Feb 2008 22:14:06 -0000 >@@ -410,6 +410,14 @@ > $vars->{'cc'} = formvalue('cc'); > } > >+ # REDHAT EXTENSION START 406151 >+ # Added devel_whiteboard, qa_whiteboard, internal_whiteboard, and status_whiteboard >+ $vars->{'status_whiteboard'} = $cloned_bug->{'status_whiteboard'}; >+ $vars->{'devel_whiteboard'} = $cloned_bug->{'devel_whiteboard'} if $user->in_group('devel'); >+ $vars->{'qa_whiteboard'} = $cloned_bug->{'qa_whiteboard'} if $user->in_group('qa'); >+ $vars->{'internal_whiteboard'} = $cloned_bug->{'internal_whiteboard'} if $user->in_group('internalwhiteboard'); >+ # REDHAT EXTENSION END 406151 >+ > foreach my $field (@enter_bug_fields) { > $vars->{$field->name} = $cloned_bug->{$field->name}; > } >@@ -454,6 +462,14 @@ > > $vars->{'cc'} = join(', ', $cgi->param('cc')); > >+ # REDHAT EXTENSION START 406151 >+ # Added devel_whiteboard, qa_whiteboard, internal_whiteboard, and status_whiteboard >+ $vars->{'status_whiteboard'} = formvalue('status_whiteboard'); >+ $vars->{'devel_whiteboard'} = formvalue('devel_whiteboard') if $user->in_group('devel'); >+ $vars->{'qa_whiteboard'} = formvalue('qa_whiteboard') if $user->in_group('qa'); >+ $vars->{'internal_whiteboard'} = formvalue('internal_whiteboard') if $user->in_group('internalwhiteboard'); >+ # REDHAT EXTENSION END 406151 >+ > $vars->{'comment'} = formvalue('comment'); > $vars->{'commentprivacy'} = formvalue('commentprivacy'); > >Index: post_bug.cgi >=================================================================== >RCS file: /cvs/qa/rh_bugzilla_3/post_bug.cgi,v >retrieving revision 1.4 >diff -u -r1.4 post_bug.cgi >--- post_bug.cgi 5 Feb 2008 22:34:17 -0000 1.4 >+++ post_bug.cgi 12 Feb 2008 22:14:06 -0000 >@@ -132,6 +132,8 @@ > my @bug_fields = grep { defined $cgi->param($_->name) } @custom_bug_fields; > @bug_fields = map { $_->name } @bug_fields; > >+# REDHAT EXTENSION START 406151 >+# Added fields devel_whiteboard, qa_whiteboard, internal_whiteboard > push(@bug_fields, qw( > product > component >@@ -154,10 +156,15 @@ > version > target_milestone > status_whiteboard >+ devel_whiteboard >+ qa_whiteboard >+ internal_whiteboard > > estimated_time > deadline > )); >+# REDHAT EXTENSION END 406151 >+ > my %bug_params; > foreach my $field (@bug_fields) { > $bug_params{$field} = $cgi->param($field); >Index: process_bug.cgi >=================================================================== >RCS file: /cvs/qa/rh_bugzilla_3/process_bug.cgi,v >retrieving revision 1.13 >diff -u -r1.13 process_bug.cgi >--- process_bug.cgi 11 Feb 2008 03:19:26 -0000 1.13 >+++ process_bug.cgi 12 Feb 2008 22:14:08 -0000 >@@ -301,10 +301,14 @@ > # Component, target_milestone, and version are in here just in case > # the 'product' field wasn't defined in the CGI. It doesn't hurt to set > # them twice. >+# REDHAT EXTENSION START 406151 >+# Added devel_whiteboard, qa_whiteboard, internal_whiteboard and fixed_in > my @set_fields = qw(op_sys rep_platform priority bug_severity > component target_milestone version >- bug_file_loc status_whiteboard short_desc >+ bug_file_loc status_whiteboard devel_whiteboard >+ qa_whiteboard internal_whiteboard fixed_in short_desc > deadline remaining_time estimated_time); >+# REDHAT EXTENSION END 406151 > push(@set_fields, 'assigned_to') if !$cgi->param('set_default_assignee'); > push(@set_fields, 'qa_contact') if !$cgi->param('set_default_qa_contact'); > my @custom_fields = Bugzilla->get_fields({custom => 1, obsolete => 0}); >Index: query.cgi >=================================================================== >RCS file: /cvs/qa/rh_bugzilla_3/query.cgi,v >retrieving revision 1.2 >diff -u -r1.2 query.cgi >--- query.cgi 4 Feb 2008 04:54:54 -0000 1.2 >+++ query.cgi 12 Feb 2008 22:14:08 -0000 >@@ -116,6 +116,8 @@ > my $foundone = 0; > > # Nothing must be undef, otherwise the template complains. >+ # REDHAT EXTENSION START 406151 >+ # Added devel_whiteboard, qa_whiteboard, internal_whiteboard and fixed_in > foreach my $name ("bug_status", "resolution", "assigned_to", > "rep_platform", "priority", "bug_severity", > "classification", "product", "reporter", "op_sys", >@@ -127,7 +129,11 @@ > "changedin", "votes", "short_desc", "short_desc_type", > "long_desc", "long_desc_type", "bug_file_loc", > "bug_file_loc_type", "status_whiteboard", >- "status_whiteboard_type", "bug_id", >+ "status_whiteboard_type", "devel_whiteboard", >+ "devel_whiteboard_type", "qa_whiteboard", >+ "qa_whiteboard_type", "internal_whiteboard", >+ "internal_whiteboard_type", "fixed_in", >+ "fixed_in_type", "bug_id", > "bugidtype", "keywords", "keywords_type", > "x_axis_field", "y_axis_field", "z_axis_field", > "chart_format", "cumulate", "x_labels_vertical", >@@ -136,6 +142,7 @@ > { > $default{$name} = []; > } >+ # REDHAT EXTENSION END 406151 > > # we won't prefill the boolean chart data from this query if > # there are any being submitted via params >Index: Bugzilla/Bug.pm >=================================================================== >RCS file: /cvs/qa/rh_bugzilla_3/Bugzilla/Bug.pm,v >retrieving revision 1.18 >diff -u -r1.18 Bug.pm >--- Bugzilla/Bug.pm 12 Feb 2008 19:45:14 -0000 1.18 >+++ Bugzilla/Bug.pm 12 Feb 2008 22:14:12 -0000 >@@ -71,6 +71,8 @@ > my @custom = Bugzilla->get_fields({ custom => 1, obsolete => 0}); > @custom = grep {$_->type != FIELD_TYPE_MULTI_SELECT} @custom; > my @custom_names = map {$_->name} @custom; >+ # REDHAT EXTENSION START 406151 >+ # Added devel_whiteboard, qa_whiteboard, internal_whiteboard and fixed_in > return qw( > alias > assigned_to >@@ -93,9 +95,14 @@ > resolution > short_desc > status_whiteboard >+ devel_whiteboard >+ qa_whiteboard >+ internal_whiteboard >+ fixed_in > target_milestone > version > ), >+ # REDHAT EXTENSION END 406151 > 'reporter AS reporter_id', > $dbh->sql_date_format('creation_ts', '%Y.%m.%d %H:%i') . ' AS creation_ts', > $dbh->sql_date_format('deadline', '%Y-%m-%d') . ' AS deadline', >@@ -126,7 +133,14 @@ > remaining_time => \&_check_remaining_time, > rep_platform => \&_check_rep_platform, > short_desc => \&_check_short_desc, >- status_whiteboard => \&_check_status_whiteboard, >+ # REDHAT EXTENSION START 406151 >+ # Added devel_whiteboard, qa_whiteboard, internal_whiteboard and fixed_in >+ status_whiteboard => \&_check_status_whiteboard, >+ devel_whiteboard => \&_check_devel_whiteboard, >+ qa_whiteboard => \&_check_qa_whiteboard, >+ internal_whiteboard => \&_check_internal_whiteboard, >+ fixed_in => \&_check_fixed_in, >+ # REDHAT EXTENSION END 406151 > }; > > # Set up validators for custom fields. >@@ -170,6 +184,8 @@ > my @custom = Bugzilla->get_fields({ custom => 1, obsolete => 0}); > @custom = grep {$_->type != FIELD_TYPE_MULTI_SELECT} @custom; > my @custom_names = map {$_->name} @custom; >+ # REDHAT EXTENSION START 406151 >+ # Added devel_whiteboard, qa_whiteboard, internal_whiteboard and fixed_in > my @columns = qw( > alias > assigned_to >@@ -191,9 +207,14 @@ > resolution > short_desc > status_whiteboard >+ devel_whiteboard >+ qa_whiteboard >+ internal_whiteboard >+ fixed_in > target_milestone > version > ); >+ # REDHAT EXTENSION END 406151 > push(@columns, @custom_names); > return @columns; > }; >@@ -298,6 +319,10 @@ > # is off. > # C<target_milestone> - When this bug is expected to be fixed. > # C<status_whiteboard> - A string. >+# C<devel_whiteboard> - A string. >+# C<qa_whiteboard> - A string. >+# C<internal_whiteboard> - A string. >+# C<fixed_in> - The version/release/milestone that the problem was fixed. > # C<bug_status> - The initial status of the bug, a string. > # C<bug_file_loc> - The URL field. > # >@@ -1399,7 +1424,15 @@ > return $short_desc; > } > >-sub _check_status_whiteboard { return defined $_[1] ? $_[1] : ''; } >+sub _check_status_whiteboard { return defined $_[1] ? $_[1] : ''; } >+ >+# REDHAT EXTENSION START 406151 >+# Added devel_whiteboard, qa_whiteboard, internal_whiteboard and fixed_in >+sub _check_devel_whiteboard { return defined $_[1] && Bugzilla->user->in_group('devel') ? $_[1] : ''; } >+sub _check_qa_whiteboard { return defined $_[1] && Bugzilla->user->in_group('qa') ? $_[1] : ''; } >+sub _check_internal_whiteboard { return defined $_[1] && Bugzilla->user->in_group('internalwhiteboard') ? $_[1] : ''; } >+sub _check_fixed_in { return defined $_[1] ? $_[1] : ''; } >+# REDHAT EXTENSION END 406151 > > # Unlike other checkers, this one doesn't return anything. > sub _check_strict_isolation { >@@ -1575,17 +1608,20 @@ > return ( > # Standard Fields > # Keep this ordering in sync with bugzilla.dtd. >+ # REDHAT EXTENSION START 406151 >+ # Added devel_whiteboard, qa_whiteboard, internal_whiteboard and fixed_in > qw(bug_id alias creation_ts short_desc delta_ts > reporter_accessible cclist_accessible > classification_id classification > product component version rep_platform op_sys >- bug_status resolution dup_id >- bug_file_loc status_whiteboard keywords >+ bug_status resolution dup_id fixed_in >+ bug_file_loc status_whiteboard devel_whiteboard >+ qa_whiteboard internal_whiteboard keywords > priority bug_severity target_milestone > dependson blocked votes everconfirmed > reporter assigned_to cc estimated_time > remaining_time actual_time deadline), >- >+ # REDHAT EXTENSION END 406151 > # Conditional Fields > Bugzilla->params->{'useqacontact'} ? "qa_contact" : (), > # Custom Fields >@@ -1943,11 +1979,18 @@ > } > } > } >-sub set_status_whiteboard { $_[0]->set('status_whiteboard', $_[1]); } >-sub set_summary { $_[0]->set('short_desc', $_[1]); } >-sub set_target_milestone { $_[0]->set('target_milestone', $_[1]); } >-sub set_url { $_[0]->set('bug_file_loc', $_[1]); } >-sub set_version { $_[0]->set('version', $_[1]); } >+sub set_status_whiteboard { $_[0]->set('status_whiteboard', $_[1]); } >+# REDHAT EXTENSION START 406151 >+# Added devel_whiteboard, qa_whiteboard, internal_whiteboard and fixed_in >+sub set_devel_whiteboard { $_[0]->set('devel_whiteboard', $_[1]) if Bugzilla->user->in_group('devel'); } >+sub set_qa_whiteboard { $_[0]->set('qa_whiteboard', $_[1]) if Bugzilla->user->in_group('qa'); } >+sub set_internal_whiteboard { $_[0]->set('internal_whiteboard', $_[1]) if Bugzilla->user->in_group('internalwhiteboard'); } >+sub set_fixed_in { $_[0]->set('fixed_in', $_[1]); } >+# REDHAT EXTENSION END 406151 >+sub set_summary { $_[0]->set('short_desc', $_[1]); } >+sub set_target_milestone { $_[0]->set('target_milestone', $_[1]); } >+sub set_url { $_[0]->set('bug_file_loc', $_[1]); } >+sub set_version { $_[0]->set('version', $_[1]); } > > ######################## > # "Add/Remove" Methods # >@@ -2909,6 +2952,15 @@ > { > $activity_visible = > Bugzilla->user->in_group(Bugzilla->params->{'timetrackinggroup'}) ? 1 : 0; >+ # REDHAT EXTENSION START 406151 >+ # Added devel_whiteboard, qa_whiteboard, internal_whiteboard and fixed_in >+ } elsif ($fieldname eq 'qa_whiteboard') { >+ $activity_visible = Bugzilla->user->in_group('qa') ? 1 : 0; >+ } elsif ($fieldname eq 'devel_whiteboard') { >+ $activity_visible = Bugzilla->user->in_group('devel') ? 1 : 0; >+ } elsif ($fieldname eq 'internal_whiteboard') { >+ $activity_visible = Bugzilla->user->in_group('internalwhiteboard') ? 1 : 0; >+ # REDHAT EXTENSION END 406151 > } else { > $activity_visible = 1; > } >Index: Bugzilla/BugMail.pm >=================================================================== >RCS file: /cvs/qa/rh_bugzilla_3/Bugzilla/BugMail.pm,v >retrieving revision 1.6 >diff -u -r1.6 BugMail.pm >--- Bugzilla/BugMail.pm 11 Feb 2008 03:20:33 -0000 1.6 >+++ Bugzilla/BugMail.pm 12 Feb 2008 22:14:13 -0000 >@@ -591,6 +591,24 @@ > && !($user->groups->{Bugzilla->params->{'insidergroup'}}) > ) { > $add_diff = 0; >+ # REDHAT EXTENSION START 406151 >+ # Added filters for devel_whiteboard, qa_whiteboard, internal_whiteboard >+ } elsif (exists($diff->{'fieldname'}) && >+ $diff->{'fieldname'} eq 'internal_whiteboard') { >+ if ($user->groups->{'internalwhiteboard'}) { >+ $add_diff = 1; >+ } >+ } elsif (exists($diff->{'fieldname'}) && >+ $diff->{'fieldname'} eq 'qa_whiteboard') { >+ if ($user->groups->{'qa'}) { >+ $add_diff = 1; >+ } >+ } elsif (exists($diff->{'fieldname'}) && >+ $diff->{'fieldname'} eq 'devel_whiteboard') { >+ if ($user->groups->{'devel'}) { >+ $add_diff = 1; >+ } >+ # REDHAT EXTENSION END 406151 > } else { > $add_diff = 1; > } >Index: Bugzilla/Field.pm >=================================================================== >RCS file: /cvs/qa/rh_bugzilla_3/Bugzilla/Field.pm,v >retrieving revision 1.2 >diff -u -r1.2 Field.pm >--- Bugzilla/Field.pm 11 Feb 2008 03:19:45 -0000 1.2 >+++ Bugzilla/Field.pm 12 Feb 2008 22:14:13 -0000 >@@ -145,6 +145,16 @@ > {name => 'bug_status', desc => 'Status', in_new_bugmail => 1}, > {name => 'status_whiteboard', desc => 'Status Whiteboard', > in_new_bugmail => 1}, >+ # REDHAT EXTENSION START 406151 >+ # Added devel_whiteboard, qa_whiteboard, internal_whiteboard and fixed_in >+ {name => 'devel_whiteboard', desc => 'Devel Whiteboard', >+ in_new_bugmail => 1}, >+ {name => 'qa_whiteboard', desc => 'QA Whiteboard', >+ in_new_bugmail => 1}, >+ {name => 'internal_whiteboard', desc => 'Internal Whiteboard', >+ in_new_bugmail => 1}, >+ {name => 'fixed_in', desc => 'Fixed In', in_new_bugmail => 1}, >+ # REDHAT EXTENSION END 406151 > {name => 'keywords', desc => 'Keywords', in_new_bugmail => 1}, > {name => 'resolution', desc => 'Resolution'}, > {name => 'bug_severity', desc => 'Severity', in_new_bugmail => 1}, >Index: Bugzilla/Search.pm >=================================================================== >RCS file: /cvs/qa/rh_bugzilla_3/Bugzilla/Search.pm,v >retrieving revision 1.6 >diff -u -r1.6 Search.pm >--- Bugzilla/Search.pm 4 Feb 2008 04:54:54 -0000 1.6 >+++ Bugzilla/Search.pm 12 Feb 2008 22:14:15 -0000 >@@ -398,8 +398,11 @@ > } > } > >+ # REDHAT EXTENSION START 406151 >+ # Added devel_whiteboard, qa_whiteboard, internal_whiteboard and fixed_in > foreach my $f ("short_desc", "long_desc", "bug_file_loc", >- "status_whiteboard") { >+ "status_whiteboard", "devel_whiteboard", "qa_whiteboard", >+ "internal_whiteboard", "fixed_in") { > if (defined $params->param($f)) { > my $s = trim($params->param($f)); > if ($s ne "") { >@@ -411,6 +414,7 @@ > } > } > } >+ # REDHAT EXTENSION END 406151 > > if (defined $params->param('content')) { > push(@specialchart, ['content', 'matches', $params->param('content')]); >Index: template/en/default/bug/edit.html.tmpl >=================================================================== >RCS file: /cvs/qa/rh_bugzilla_3/template/en/default/bug/edit.html.tmpl,v >retrieving revision 1.8 >diff -u -r1.8 edit.html.tmpl >--- template/en/default/bug/edit.html.tmpl 11 Feb 2008 03:20:40 -0000 1.8 >+++ template/en/default/bug/edit.html.tmpl 12 Feb 2008 22:14:17 -0000 >@@ -602,11 +602,41 @@ > [% IF Param('usestatuswhiteboard') %] > <tr> > <td class="field_label"> >- <label for="status_whiteboard" accesskey="w"><b><u>W</u>hiteboard</b></label>: >+ <label for="status_whiteboard" accesskey="w"><b>Status <u>W</u>hiteboard</b></label>: > </td> > [% PROCESS input inputname => "status_whiteboard" size => "40" colspan => 2 %] > </tr> > [% END %] >+ >+ [%# REDHAT EXTENSION START 406151 >+ # Added devel_whiteboard, qa_whiteboard, internal_whiteboard %] >+ [% IF user.in_group('devel') %] >+ <tr> >+ <td class="field_label"> >+ <label for="devel_whiteboard"><b>Devel Whiteboard</b></label>: >+ </td> >+ [% PROCESS input inputname => "devel_whiteboard" size => "40" colspan => 2 %] >+ </tr> >+ [% END %] >+ >+ [% IF user.in_group('qa') %] >+ <tr> >+ <td class="field_label"> >+ <label for="qa_whiteboard"><b>QA Whiteboard</b></label>: >+ </td> >+ [% PROCESS input inputname => "qa_whiteboard" size => "40" colspan => 2 %] >+ </tr> >+ [% END %] >+ >+ [% IF user.in_group('internalwhiteboard') %] >+ <tr> >+ <td class="field_label"> >+ <label for="internal_whiteboard"><b>Internal Whiteboard</b></label>: >+ </td> >+ [% PROCESS input inputname => "internal_whiteboard" size => "40" colspan => 2 %] >+ </tr> >+ [% END %] >+ [%# REDHAT EXTENSION END 406151 %] > > [% IF use_keywords %] > <tr> >Index: template/en/default/bug/knob.html.tmpl >=================================================================== >RCS file: /cvs/qa/rh_bugzilla_3/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 19 Nov 2007 22:11:21 -0000 1.1.1.1 >+++ template/en/default/bug/knob.html.tmpl 12 Feb 2008 22:14:17 -0000 >@@ -45,6 +45,12 @@ > </label> > [% IF bug.isopened && !bug_status.is_open %] > and set the resolution to [% PROCESS select_resolution field = "knob_${bug_status.id}" %] >+ <br> >+ [%# REDHAT EXTENSION 406151 >+ # Added fixed_in field %] >+ Fixed in version >+ <input name="fixed_in" size="10" maxsize="20" value="[% bug.fixed_in FILTER html %]"> >+ <br> > [% END %] > <br> > [% END %] >@@ -70,6 +76,9 @@ > </label> > [% PROCESS select_resolution field = "knob_change_resolution" %] > <br> >+ Fixed in version >+ <input name="fixed_in" size="10" maxsize="20" value="[% bug.fixed_in FILTER html %]"> >+ <br> > [% END %] > [% END %] > >Index: template/en/default/bug/show-multiple.html.tmpl >=================================================================== >RCS file: /cvs/qa/rh_bugzilla_3/template/en/default/bug/show-multiple.html.tmpl,v >retrieving revision 1.1.1.1 >diff -u -r1.1.1.1 show-multiple.html.tmpl >--- template/en/default/bug/show-multiple.html.tmpl 19 Nov 2007 22:11:21 -0000 1.1.1.1 >+++ template/en/default/bug/show-multiple.html.tmpl 12 Feb 2008 22:14:17 -0000 >@@ -175,6 +175,20 @@ > [% IF Param("usestatuswhiteboard") %] > [% PROCESS row cell = "status_whiteboard" fullrow = 1 %] > [% END %] >+ [%# REDHAT EXTENSION START 406151 >+ # Added devel_whiteboard, qa_whiteboard, internal_whiteboard and fixed_in %] >+ [% IF user.in_group("devel") %] >+ [% PROCESS row cell = "devel_whiteboard" fullrow = 1 %] >+ [% END %] >+ [% IF user.in_group("qa") %] >+ [% PROCESS row cell = "qa_whiteboard" fullrow = 1 %] >+ [% END %] >+ [% IF user.in_group("internalwhiteboard") %] >+ [% PROCESS row cell = "internal_whiteboard" fullrow = 1 %] >+ [% END %] >+ >+ [% PROCESS row cell = "fixed_in" fullrow = 1 %] >+ [%# REDHAT EXTENSION END 406151 %] > > [% USE Bugzilla %] > [% field_counter = 0 %] >Index: template/en/default/bug/create/create.html.tmpl >=================================================================== >RCS file: /cvs/qa/rh_bugzilla_3/template/en/default/bug/create/create.html.tmpl,v >retrieving revision 1.3 >diff -u -r1.3 create.html.tmpl >--- template/en/default/bug/create/create.html.tmpl 4 Dec 2007 17:39:26 -0000 1.3 >+++ template/en/default/bug/create/create.html.tmpl 12 Feb 2008 22:14:18 -0000 >@@ -516,6 +516,49 @@ > </td> > </tr> > >+ [%# REDHAT EXTENSION START 406151 >+ # Added status_whiteboard, devel_whiteboard, qa_whiteboard, and internal_whiteboard %] >+ [% IF Param('usestatuswhiteboard') %] >+ <tr> >+ <th>Status <u>W</u>hiteboard:</th> >+ <td> >+ <input name="status_whiteboard" accesskey="w" >+ value="[% status_whiteboard FILTER html %]" size="60"> >+ </td> >+ </tr> >+ [% END %] >+ >+ [% IF user.in_group('qa') %] >+ <tr> >+ <th>QA Whiteboard:</th> >+ <td> >+ <input name="qa_whiteboard" >+ value="[% qa_whiteboard FILTER html %]" size="60"> >+ </td> >+ </tr> >+ [% END %] >+ >+ [% IF user.in_group('devel') %] >+ <tr> >+ <th>Devel Whiteboard:</th> >+ <td> >+ <input name="devel_whiteboard" >+ value="[% devel_whiteboard FILTER html %]" size="60"> >+ </td> >+ </tr> >+ [% END %] >+ >+ [% IF user.in_group('internalwhiteboard') %] >+ <tr> >+ <th>Internal Whiteboard:</th> >+ <td> >+ <input name="internal_whiteboard" >+ value="[% internal_whiteboard FILTER html %]" size="60"> >+ </td> >+ </tr> >+ [% END %] >+ [%# REDHAT EXTENSION END 406151 %] >+ > [% IF user.in_group('editbugs', product.id) %] > [% IF use_keywords %] > <tr> >Index: template/en/default/global/field-descs.none.tmpl >=================================================================== >RCS file: /cvs/qa/rh_bugzilla_3/template/en/default/global/field-descs.none.tmpl,v >retrieving revision 1.1.1.1 >diff -u -r1.1.1.1 field-descs.none.tmpl >--- template/en/default/global/field-descs.none.tmpl 19 Nov 2007 22:11:21 -0000 1.1.1.1 >+++ template/en/default/global/field-descs.none.tmpl 12 Feb 2008 22:14:18 -0000 >@@ -22,6 +22,8 @@ > > [% PROCESS global/variables.none.tmpl %] > >+[%# REDHAT EXTENSION START 406151 >+ # Added devel_whiteboard, qa_whiteboard, internal_whiteboard and fixed_in %] > [% field_descs = { "[Bug creation]" => "[$terms.Bug creation]", > "actual_time" => "Actual Hours" > "alias" => "Alias", >@@ -61,11 +63,16 @@ > "setting" => "Setting", > "settings" => "Settings", > "short_desc" => "Summary", >- "status_whiteboard" => "Whiteboard", >+ "status_whiteboard" => "Status Whiteboard", >+ "devel_whiteboard" => "Devel Whiteboard", >+ "qa_whiteboard" => "QA Whiteboard", >+ "internal_whiteboard" => "Internal Whiteboard", >+ "fixed_in" => "Fixed In", > "target_milestone" => "Target Milestone", > "version" => "Version", > "votes" => "Votes", > "work_time" => "Hours Worked"} %] >+[%# REDHAT EXTENSION END 406151 %] > > [%# Also include any custom fields or fields which don't have a > Description here, by copying their Description from the >Index: template/en/default/global/user-error.html.tmpl >=================================================================== >RCS file: /cvs/qa/rh_bugzilla_3/template/en/default/global/user-error.html.tmpl,v >retrieving revision 1.11 >diff -u -r1.11 user-error.html.tmpl >--- template/en/default/global/user-error.html.tmpl 12 Feb 2008 04:33:05 -0000 1.11 >+++ template/en/default/global/user-error.html.tmpl 12 Feb 2008 22:14:21 -0000 >@@ -1232,11 +1232,11 @@ > Patches cannot be more than [% Param('maxpatchsize') %] KB in size. > Try breaking your patch into several pieces. > >- [% #REDHAT EXTENSION START 406141 %] >+ [%#REDHAT EXTENSION START 406141 %] > [% ELSIF error == "product_access_denied" %] > Either the product '[% product FILTER html %]' does not exist or > you don't have access to it. >- [% #REDHAT EXTENSION END 406141 %] >+ [%#REDHAT EXTENSION END 406141 %] > > [% ELSIF error == "product_doesnt_exist" %] > [% title = "Specified Product Does Not Exist" %] >Index: template/en/default/list/edit-multiple.html.tmpl >=================================================================== >RCS file: /cvs/qa/rh_bugzilla_3/template/en/default/list/edit-multiple.html.tmpl,v >retrieving revision 1.2 >diff -u -r1.2 edit-multiple.html.tmpl >--- template/en/default/list/edit-multiple.html.tmpl 8 Jan 2008 02:06:42 -0000 1.2 >+++ template/en/default/list/edit-multiple.html.tmpl 12 Feb 2008 22:14:21 -0000 >@@ -239,6 +239,45 @@ > </tr> > [% END %] > >+ [%# REDHAT EXTENSION START 406151 >+ # Added devel_whiteboard, qa_whiteboard, internal_whiteboard %] >+ [% IF user.in_group('devel') %] >+ <tr> >+ <td align="right"> >+ <b>Devel Whiteboard:</b> >+ </td> >+ <td colspan="7"> >+ <input name="devel_whiteboard" >+ value="[% dontchange FILTER html %]" size="60"> >+ </td> >+ </tr> >+ [% END %] >+ >+ [% IF user.in_group('qa') %] >+ <tr> >+ <td align="right"> >+ <b>QA Whiteboard:</b> >+ </td> >+ <td colspan="7"> >+ <input name="qa_whiteboard" >+ value="[% dontchange FILTER html %]" size="60"> >+ </td> >+ </tr> >+ [% END %] >+ >+ [% IF user.in_group('internalwhiteboard') %] >+ <tr> >+ <td align="right"> >+ <b>Internal Whiteboard:</b> >+ </td> >+ <td colspan="7"> >+ <input name="internal_whiteboard" >+ value="[% dontchange FILTER html %]" size="60"> >+ </td> >+ </tr> >+ [% END %] >+ [%# REDHAT EXTENSION END 406151 %] >+ > [% USE Bugzilla %] > [% FOREACH field = Bugzilla.get_fields({ obsolete => 0, custom => 1 }) %] > <tr> >Index: template/en/default/list/table.html.tmpl >=================================================================== >RCS file: /cvs/qa/rh_bugzilla_3/template/en/default/list/table.html.tmpl,v >retrieving revision 1.2 >diff -u -r1.2 table.html.tmpl >--- template/en/default/list/table.html.tmpl 14 Jan 2008 15:37:49 -0000 1.2 >+++ template/en/default/list/table.html.tmpl 12 Feb 2008 22:14:21 -0000 >@@ -37,6 +37,8 @@ > [% field_descs.reporter_realname = field_descs.reporter %] > [% field_descs.qa_contact_realname = field_descs.qa_contact %] > >+[%# REDHAT EXTENSION START 406151 >+ # Added devel_whiteboard, qa_whiteboard, internal_whiteboard and fixed_in %] > [% abbrev = > { > "bug_severity" => { maxlength => 3 , title => "Sev" } , >@@ -49,18 +51,23 @@ > "reporter_realname" => { maxlength => 20 , ellipsis => "..." } , > "qa_contact" => { maxlength => 30 , ellipsis => "..." , title => "QAContact" } , > "qa_contact_realname" => { maxlength => 20 , ellipsis => "..." , title => "QAContact" } , >- "resolution" => { maxlength => 4 } , >- "short_desc" => { wrap => 1 } , >- "short_short_desc" => { maxlength => 60 , ellipsis => "..." , wrap => 1 } , >- "status_whiteboard" => { title => "Whiteboard" , wrap => 1 } , >- "component" => { maxlength => 8 , title => "Comp" } , >- "product" => { maxlength => 8 } , >- "version" => { maxlength => 5 , title => "Vers" } , >- "op_sys" => { maxlength => 4 } , >- "target_milestone" => { title => "TargetM" } , >- "percentage_complete" => { format_value => "%d %%" } , >+ "resolution" => { maxlength => 4 } , >+ "short_desc" => { wrap => 1 } , >+ "short_short_desc" => { maxlength => 60 , ellipsis => "..." , wrap => 1 } , >+ "status_whiteboard" => { title => "StatusWhiteboard" , wrap => 1 } , >+ "devel_whiteboard" => { title => "DevelWhiteboard" , wrap => 1 } , >+ "qa_whiteboard" => { title => "QAWhiteboard" , wrap => 1 } , >+ "internal_whiteboard" => { title => "InternalWhiteboard" , wrap => 1 } , >+ "fixed_in" => { title => "Fixed In", wrap => 1 }, >+ "component" => { maxlength => 8 , title => "Comp" } , >+ "product" => { maxlength => 8 } , >+ "version" => { maxlength => 5 , title => "Vers" } , >+ "op_sys" => { maxlength => 4 } , >+ "target_milestone" => { title => "TargetM" } , >+ "percentage_complete" => { format_value => "%d %%" } , > } > %] >+[%# REDHAT EXTENSION END 406151 %] > > [% PROCESS bug/time.html.tmpl %] > >Index: template/en/default/search/form.html.tmpl >=================================================================== >RCS file: /cvs/qa/rh_bugzilla_3/template/en/default/search/form.html.tmpl,v >retrieving revision 1.1.1.1 >diff -u -r1.1.1.1 form.html.tmpl >--- template/en/default/search/form.html.tmpl 19 Nov 2007 22:11:21 -0000 1.1.1.1 >+++ template/en/default/search/form.html.tmpl 12 Feb 2008 22:14:21 -0000 >@@ -264,15 +264,24 @@ > > [%# *** Comment URL Whiteboard Keywords *** %] > >+ [%# REDHAT EXTENSION START 406151 >+ # Added devel_whiteboard, qa_whiteboard, internal_whiteboard and fixed_in %] > [% FOREACH field = [ > { name => "long_desc", description => "A <u>C</u>omment", > accesskey => 'c' }, > { name => "bug_file_loc", description => "The <u>U</u>RL", > accesskey => 'u' }, >- { name => "status_whiteboard", description => "<u>W</u>hiteboard", >- accesskey => 'w' } ] %] >- >- [% UNLESS field.name == 'status_whiteboard' AND NOT Param('usestatuswhiteboard') %] >+ { name => "status_whiteboard", description => "Status <u>W</u>hiteboard", >+ accesskey => 'w' }, >+ { name => "devel_whiteboard", description => "Devel Whiteboard" }, >+ { name => "qa_whiteboard", description => "QA Whiteboard" }, >+ { name => "internal_whiteboard", description => "Internal Whiteboard"}, >+ { name => "fixed_in", description => "Fixed In"} ] %] >+ >+ [% UNLESS (field.name == 'status_whiteboard' AND NOT Param('usestatuswhiteboard')) >+ || (field.name == 'devel_whiteboard' AND NOT user.in_group('devel')) >+ || (field.name == 'qa_whiteboard' AND NOT user.in_group('qa')) >+ || (field.name == 'internal_whiteboard' AND NOT user.in_group('internalwhiteboard')) %] > <tr> > <th align="right"> > <label for="[% field.name %]" accesskey="[% field.accesskey %]">[% field.description %]</label>: >@@ -293,6 +302,7 @@ > </tr> > [% END %] > [% END %] >+ [%# REDHAT EXTENSION END 406151 %] > > [% IF have_keywords %] > <tr>
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=294706">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Flags:
nelhawar
: review-
Actions:
View
|
Diff
Attachments on
bug 406151
:
294263
|
294269
|
294706
|
294730