Attachment 303414 Details for Bug 443465 – The patch to fix the "remove field flags.isactive"

[patch] The patch to fix the "remove field flags.isactive"

4.1.patch (text/plain), 7.72 KB, created by XINSUN on 2008-04-23 02:29:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: XINSUN

Created: 2008-04-23 02:29:30 UTC

Size: 7.72 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 02:21:38 -0000
>@@ -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;
>Index: Bugzilla/Flag.pm
>===================================================================
>RCS file: /cvs/qa/hwcert/Bugzilla/Flag.pm,v
>retrieving revision 1.2
>diff -u -r1.2 Flag.pm
>--- Bugzilla/Flag.pm	19 Jul 2007 19:31:53 -0000	1.2
>+++ Bugzilla/Flag.pm	23 Apr 2008 02:21:38 -0000
>@@ -53,7 +53,7 @@
> # basic sets of columns and tables for getting flags from the database
> 
> my @base_columns = 
>-  ("is_active", "id", "type_id", "bug_id", "attach_id", "requestee_id", 
>+  ("id", "type_id", "bug_id", "attach_id", "requestee_id", 
>    "setter_id", "status");
> 
> # Note: when adding tables to @base_tables, make sure to include the separator 
>@@ -232,8 +232,8 @@
>     
>     # Take a snapshot of flags before any changes.
>     my $flags = match({ 'bug_id'    => $target->{'bug'}->{'id'} , 
>-                        'attach_id' => $target->{'attachment'}->{'id'} ,
>-                        'is_active' => 1 });
>+                        'attach_id' => $target->{'attachment'}->{'id'} });
>+
>     my @old_summaries;
>     foreach my $flag (@$flags) {
>         my $summary = $flag->{'type'}->{'name'} . $flag->{'status'};
>@@ -256,7 +256,6 @@
>             AND (bugs.product_id = i.product_id OR i.product_id IS NULL)
>             AND (bugs.component_id = i.component_id OR i.component_id IS NULL))
>         WHERE bugs.bug_id = $target->{'bug'}->{'id'} 
>-        AND flags.is_active = 1
>         AND i.type_id IS NULL
>     ");
>     clear(&::FetchOneColumn()) while &::MoreSQLData();
>@@ -266,7 +265,6 @@
>         WHERE bugs.bug_id = $target->{'bug'}->{'id'}
>         AND flags.bug_id = bugs.bug_id
>         AND flags.type_id = e.type_id
>-        AND flags.is_active = 1 
>         AND (bugs.product_id = e.product_id OR e.product_id IS NULL)
>         AND (bugs.component_id = e.component_id OR e.component_id IS NULL)
>     ");
>@@ -274,8 +272,8 @@
>     
>     # Take a snapshot of flags after changes.
>     $flags = match({ 'bug_id'    => $target->{'bug'}->{'id'} , 
>-                     'attach_id' => $target->{'attachment'}->{'id'} ,
>-                     'is_active' => 1 });
>+                     'attach_id' => $target->{'attachment'}->{'id'} });
>+
>     my @new_summaries;
>     foreach my $flag (@$flags) {
>         my $summary = $flag->{'type'}->{'name'} . $flag->{'status'};
>@@ -408,7 +406,6 @@
>                                requestee_id = NULL , 
>                                status = '$status' , 
>                                modification_date = $timestamp ,
>-                               is_active = 1
>                         WHERE  id = $flag->{'id'}");
>             
>             # Send an email notifying the relevant parties about the fulfillment.
>@@ -433,7 +430,6 @@
>                                requestee_id = $requestee_id , 
>                                status = '$status' , 
>                                modification_date = $timestamp ,
>-                               is_active = 1
>                         WHERE  id = $flag->{'id'}");
>             
>             # Send an email notifying the relevant parties about the request.
>Index: Bugzilla/Attachment.pm
>===================================================================
>RCS file: /cvs/qa/hwcert/Bugzilla/Attachment.pm,v
>retrieving revision 1.1.1.1
>diff -u -r1.1.1.1 Attachment.pm
>--- Bugzilla/Attachment.pm	16 Nov 2004 16:42:36 -0000	1.1.1.1
>+++ Bugzilla/Attachment.pm	23 Apr 2008 02:21:38 -0000
>@@ -90,8 +100,7 @@
>      $a{'datasize'}) = &::FetchSQLData();
> 
>     # Retrieve a list of flags for this attachment.
>-    $a{'flags'} = Bugzilla::Flag::match({ 'attach_id' => $a{'attachid'},
>-                                          'is_active' => 1 });
>+    $a{'flags'} = Bugzilla::Flag::match({ 'attach_id' => $a{'attachid'} });
>     
>     # We will display the edit link if the user can edit the attachment;
>     # ie the are the submitter, or they have canedit.
>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 02:21:38 -0000
>@@ -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");
> 
>Index: attachment.cgi
>===================================================================
>RCS file: /cvs/qa/hwcert/attachment.cgi,v
>retrieving revision 1.10
>diff -u -r1.10 attachment.cgi
>--- attachment.cgi	15 Feb 2008 21:53:11 -0000	1.10
>+++ attachment.cgi	23 Apr 2008 02:21:38 -0000
>@@ -843,8 +867,7 @@
>      $a{'description'}, $a{'ispatch'}, $a{'isobsolete'}, $a{'isprivate'},
>      $a{'datasize'}) = FetchSQLData();
>     $a{'isviewable'} = isViewable($a{'contenttype'});
>-    $a{'flags'} = Bugzilla::Flag::match({ 'attach_id' => $a{'attachid'},
>-                                          'is_active' => 1 });
>+    $a{'flags'} = Bugzilla::Flag::match({ 'attach_id' => $a{'attachid'} });
> 
>     # Add the hash representing the attachment to the array of attachments.
>     push @attachments, \%a;
>@@ -980,8 +1009,7 @@
>                VALUES ($::FORM{'bugid'}, $obsolete_id, $::userid, NOW(), $fieldid, '0', '1')");
>       # If the obsolete attachment has pending flags, migrate them to the new attachment.
>       if (Bugzilla::Flag::count({ 'attach_id' => $obsolete_id , 
>-                                  'status' => 'pending',
>-                                  'is_active' => 1 })) {
>+                                  'status' => 'pending' })) {
>         Bugzilla::Flag::migrate($obsolete_id, $attachid);
>       }
>   }
>@@ -1096,8 +1133,7 @@
>   foreach my $flag_type (@$flag_types) {
>     $flag_type->{'view_gname'} = GroupIdToName($flag_type->{'view_gid'}); 
>     $flag_type->{'flags'} = Bugzilla::Flag::match({ 'type_id'   => $flag_type->{'id'}, 
>-                                                    'attach_id' => $::FORM{'id'},
>-                                                    'is_active' => 1 });
>+                                                    'attach_id' => $::FORM{'id'}  });
>   }
>   $vars->{'flag_types'} = $flag_types;
>   $vars->{'any_flags_requesteeble'} = grep($_->{'is_requesteeble'}, @$flag_types);

Actions: View | Diff

Attachments on bug 443465: 303414 | 303781