Attachment 290035 Details for Bug 406171 – patch that we applied to rh_bugzilla_2_18 to have use the new desription field in the bug status table

patch that we applied to rh_bugzilla_2_18 to have use the new desription field in the bug status table

bug_status.patch (text/plain), 10.35 KB, created by Noura El hawary on 2007-12-19 15:48:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noura El hawary

Created: 2007-12-19 15:48:20 UTC

Size: 10.35 KB

patch

obsolete

>Index: template/en/default/bug/knob.html.tmpl
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_2_18/template/en/default/bug/knob.html.tmpl,v
>retrieving revision 1.30
>diff -u -r1.30 knob.html.tmpl
>--- template/en/default/bug/knob.html.tmpl	5 Feb 2007 19:21:03 -0000	1.30
>+++ template/en/default/bug/knob.html.tmpl	25 Sep 2007 02:49:49 -0000
>@@ -41,14 +41,16 @@
>       donothing_reassign =   "Leave assigned to <b>" _ tmp.owner _ "</b>&nbsp;";
>       
>       IF ! buglist.defined;  # not coming from a multiple edit page
>-          bugstatuses    = [bug.bug_status()];
>-          bugresolutions = [bug.resolution()];
>-          resolutions    = bug.choices.resolution;
>-          iseditor       = bug.user.canedit;
>-          isconfirmer    = bug.user.canconfirm;
>-          tmpproduct    = bug.product;
>-          tmpcomponent  = bug.component;
>-          knobproducts   = {$tmpproduct => {$tmpcomponent => 1}};
>+          bugstatuses     = [bug.bug_status()];
>+          bugresolutions  = [bug.resolution()];
>+          resolutions     = bug.choices.resolution;
>+          statuses        = bug.choices.bug_status;
>+          bug_status_attr = bug.choices.bug_status_attr;
>+          iseditor        = bug.user.canedit;
>+          isconfirmer     = bug.user.canconfirm;
>+          tmpproduct      = bug.product;
>+          tmpcomponent    = bug.component;
>+          knobproducts    = {$tmpproduct => {$tmpcomponent => 1}};
>       END;
> 
>    ELSE;                 # multiple Bugs
>@@ -183,35 +185,15 @@
>              onchange="[% "toggleNeedinfo(document.changeform);" IF onebug %]">
>       <label for="knob-changestatus">Change status to</label> 
>         <select name="newstatus" 
>-            onchange="document.changeform.knob[[% knum %]].checked=true; [% "toggleNeedinfo(document.changeform);" IF onebug %] ">
>-        [% IF !bugstatuses.containsonly("ASSIGNED") && isconfirmer %]
>-          <option value="accept" title="Accept [% bugterm %]">ASSIGNED</option>
>-        [% END %]
>-        [% IF !bugstatuses.containsonly("NEEDINFO") %]
>-          <option value="needinfo" title="Report needs more information">NEEDINFO</option>
>-        [% END %]
>-        [% IF !bugstatuses.containsonly("MODIFIED") && UserInGroup("modified")  %]
>-          <option value="modified" title="Fix waiting for confirmation">MODIFIED</option>
>-        [% END %]
>-        [% IF !bugstatuses.containsonly("ON_DEV") %]
>-          <option value="on_dev" title="Undergoing integration testing in dev">ON_DEV</option>
>-        [% END %]
>-        [% IF !bugstatuses.containsonly("ON_QA") %]
>-          <option value="on_qa" title="Undergoing full testing by QA">ON_QA</option>
>-        [% END %]
>-        [% IF !bugstatuses.containsonly("VERIFIED") %]
>-          <option value="verified" title="QA testing is complete">VERIFIED</option>
>-        [% END %]
>-        [% IF !bugstatuses.containsonly("FAILS_QA") %]
>-          <option value="fails_qa" title="Fails QA testing">FAILS_QA</option>
>-        [% END %]
>-        [% IF !bugstatuses.containsonly("RELEASE_PENDING") %]
>-          <option value="release_pending" title="Fix has been approved by QA and is ready for beta">RELEASE_PENDING</option>
>-        [% END %]
>-        [% IF !bugstatuses.containsonly("POST") %]
>-          <option value="post" title="A transient state between ASSIGNED and MODIFIED">POST</option>
>-        [% END %]
>-      </select>
>+          onchange="document.changeform.knob[[% knum %]].checked=true; [% "toggleNeedinfo(document.changeform);" IF onebug %] ">
>+          [% FOREACH s = statuses %]
>+            [% IF bug_status_attr.$s.is_open && bug_status_attr.$s.is_active && !bugstatuses.containsonly("$s") %]
>+              <option value="[% s FILTER lower %]" title="[% bug.choices.bug_status_attr.$s.description FILTER html %]">
>+                [% s FILTER html %]</option>
>+            [% END %]
>+          [% END %]
>+        </select>
>+
> 
>       [% IF bug.bug_status != 'NEEDINFO' %]
>         [% PROCESS needinfo_block %]
>Index: buglist.cgi
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_2_18/buglist.cgi,v
>retrieving revision 1.25
>diff -u -r1.25 buglist.cgi
>--- buglist.cgi	9 Jun 2007 14:57:12 -0000	1.25
>+++ buglist.cgi	25 Sep 2007 02:49:49 -0000
>@@ -822,6 +822,11 @@
>     $vars->{'iseditor'} = 1;
>     $vars->{'isconfirmer'} = 1;
>     $vars->{'bugresolutions'} = [ keys %$bugresolutions ];
>+    # XXX-dkl Need to export the status list and 
>+    # XXX-dkl bug_status_attr hash to knob.html.tmpl 
>+    # XXX-dkl since we are not loading a single Bug.pm object  
>+    $vars->{'statuses'} = \@::legal_bug_status;
>+    $vars->{'bug_status_attr'} = \%::bug_status_attr;
> 
>     # if only one bug set up a bug object which the knob template expects
>     if (@bugidlist == 1) {
>Index: globals.pl
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_2_18/globals.pl,v
>retrieving revision 1.64
>diff -u -r1.64 globals.pl
>--- globals.pl	18 Sep 2007 01:11:05 -0000	1.64
>+++ globals.pl	25 Sep 2007 02:49:49 -0000
>@@ -204,6 +204,23 @@
>         $carray{$c} = 1;
>     }
> 
>+
>+   %::bug_status_attr = ();
>+   SendSQL("SELECT value, description, isactive, is_open, sortkey " .
>+           "FROM bug_status ORDER BY sortkey");
>+
>+   while(@line = FetchSQLData()) {
>+       my ($status, $description, $is_active, $is_open, $sortkey) = (@line);
>+       if (!defined $::bug_status_desc{$status}) {
>+           $::bug_status_attr{$status}{description} = $description;  
>+           $::bug_status_attr{$status}{is_active} = $is_active;
>+           $::bug_status_attr{$status}{is_open} = $is_open;
>+           $::bug_status_attr{$status}{sortkey} = $sortkey;
>+           push @::legal_bug_status, $status;
>+       }  
>+
>+   }
>+
>     my $dotargetmilestone = 1;  # This used to check the param, but there's
>                                 # enough code that wants to pretend we're using
>                                 # target milestones, even if they don't get
>@@ -243,7 +260,6 @@
>     @::legal_severity = Bugzilla::DB::SplitEnumType($cols->{"bug_severity,type"}, 'bug_severity');
>     @::legal_platform = Bugzilla::DB::SplitEnumType($cols->{"rep_platform,type"}, 'rep_platform');
>     @::legal_opsys = Bugzilla::DB::SplitEnumType($cols->{"op_sys,type"}, 'op_sys');
>-    @::legal_bug_status = Bugzilla::DB::SplitEnumType($cols->{"bug_status,type"}, 'bug_status');
>     @::legal_resolution = Bugzilla::DB::SplitEnumType($cols->{"resolution,type"}, 'resolution');
> 
>     # 'settable_resolution' is the list of resolutions that may be set 
>@@ -292,11 +308,13 @@
>     print $fh (Data::Dumper->Dump([\@::legal_components, \@::legal_product,
>                                    \@::legal_priority, \@::legal_severity,
>                                    \@::legal_platform, \@::legal_opsys,
>-                                   \@::legal_bug_status, \@::legal_resolution],
>+                                   \@::legal_bug_status, \@::legal_resolution,
>+                                   \%::bug_status_attr],
>                                   ['*::legal_components', '*::legal_product',
>                                    '*::legal_priority', '*::legal_severity',
>                                    '*::legal_platform', '*::legal_opsys',
>-                                   '*::legal_bug_status', '*::legal_resolution']));
>+                                   '*::legal_bug_status', '*::legal_resolution',
>+                                   '*::bug_status_attr']));
> 
>     print $fh (Data::Dumper->Dump([\@::settable_resolution, \%::proddesc,
>                                    \@::enterable_products, \%::prodmaxvotes],
>Index: process_bug.cgi
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_2_18/process_bug.cgi,v
>retrieving revision 1.86
>diff -u -r1.86 process_bug.cgi
>--- process_bug.cgi	18 Sep 2007 01:09:30 -0000	1.86
>+++ process_bug.cgi	25 Sep 2007 02:49:49 -0000
>@@ -1098,15 +1098,15 @@
>     };
> 
>     # backwards compat. for buglist.cgi.
>-    /^(?:accept|needinfo|modified|assign_to_pm|investigate|spec|on_dev|qa_ready|on_qa|fails_qa|prod_ready)$/ && do {
>-      $::FORM{'newstatus'} = 'accept';
>+    /^(?:assigned|needinfo|modified|assign_to_pm|investigate|spec|on_dev|qa_ready|on_qa|fails_qa|prod_ready)$/ && do {
>+      $::FORM{'newstatus'} = 'assigned';
>       $::FORM{'knob'} = 'changestatus';
>       # last STATUS   #NOT!
>     };
> 
>     /^changestatus$/ && do {
>         STATUS: for ($::FORM{'newstatus'}) {
>-            /^accept$/ && CheckonComment( "accept" ) && do {
>+            /^assigned$/ && do {
>                 $::FORM{'bug_status'} = 'ASSIGNED';
>                 if (Param("musthavemilestoneonaccept") &&
>                         scalar(@{$::target_milestone{$::FORM{'product'}}}) > 1) {
>@@ -1121,7 +1121,7 @@
>                 last STATUS;
>             };
>             /^modified$/ && do {
>-                $::FORM{'bug_status'} = 'MODIFIED' if UserInGroup("modified");
>+                $::FORM{'bug_status'} = 'MODIFIED';
>                 last STATUS;
>             };
>             /^on_dev$/ && do {
>Index: Bugzilla/Bug.pm
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_2_18/Bugzilla/Bug.pm,v
>retrieving revision 1.49
>diff -u -r1.49 Bug.pm
>--- Bugzilla/Bug.pm	17 Aug 2007 04:01:19 -0000	1.49
>+++ Bugzilla/Bug.pm	25 Sep 2007 02:49:49 -0000
>@@ -27,7 +27,7 @@
> 
> use Bugzilla::RelationSet;
> use vars qw($unconfirmedstate @legal_keywords @legal_platform
>-            @legal_priority @legal_severity @legal_opsys @legal_bugs_status
>+            @legal_priority @legal_severity @legal_opsys @legal_bug_status
>             @settable_resolution %components %versions %target_milestone
>             @enterable_products %milestoneurl %prodmaxvotes);
> 
>@@ -518,6 +518,7 @@
>     # Hack - this array contains "". See bug 106589.
>     my @res = grep ($_, @::settable_resolution);
> 
>+
>     $self->{'choices'} =
>       {
>        'product' => \@prodlist,
>@@ -525,11 +526,12 @@
>        'priority' => \@::legal_priority,
>        'bug_severity' => \@::legal_severity,
>        'op_sys' => \@::legal_opsys,
>-       'bug_status' => \@::legal_bugs_status,
>+       'bug_status' => \@::legal_bug_status,
>        'resolution' => \@res,
>        'component' => $::components{$self->{product}},
>        'version' => $::versions{$self->{product}},
>        'target_milestone' => $::target_milestone{$self->{product}},
>+       'bug_status_attr' => \%::bug_status_attr,
>       };
> 
>     return $self->{'choices'};

Actions: View

Attachments on bug 406171: 290035 | 294687 | 294911 | 294941