diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2012-01-09 22:01:11 +0100 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2012-01-09 22:01:11 +0100 |
| commit | fc00589a935d888db49ca4d45675102f1affacd0 (patch) | |
| tree | da99ccc4803ccb292daf4037a8f19b92d0fd5a54 /Bugzilla | |
| parent | 23df227af3c7e2d1e9aaefda9ff2b4fd45546ac3 (diff) | |
| download | bugzilla-fc00589a935d888db49ca4d45675102f1affacd0.tar.gz bugzilla-fc00589a935d888db49ca4d45675102f1affacd0.tar.xz | |
715477: Inactive but set flags are no longer visible when editing a bug
https://bugzilla.mozilla.org/show_bug.cgi?id=715477
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/Attachment.pm | 3 | ||||
| -rw-r--r-- | Bugzilla/Bug.pm | 5 | ||||
| -rw-r--r-- | Bugzilla/FlagType.pm | 7 |
3 files changed, 10 insertions, 5 deletions
diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm index 2a89678c5..5ac71412c 100644 --- a/Bugzilla/Attachment.pm +++ b/Bugzilla/Attachment.pm @@ -504,7 +504,8 @@ sub flag_types { my $vars = { target_type => 'attachment', product_id => $self->bug->product_id, component_id => $self->bug->component_id, - attach_id => $self->id }; + attach_id => $self->id, + active_or_has_flags => $self->bug_id }; $self->{flag_types} = Bugzilla::Flag->_flag_types($vars); return $self->{flag_types}; diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index 131ece6ff..6b51129af 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -3290,8 +3290,7 @@ sub duplicate_ids { } sub flag_types { - my ($self, $params) = @_; - $params ||= {}; + my ($self) = @_; return $self->{'flag_types'} if exists $self->{'flag_types'}; return [] if $self->{'error'}; @@ -3299,7 +3298,7 @@ sub flag_types { product_id => $self->{product_id}, component_id => $self->{component_id}, bug_id => $self->bug_id, - %$params }; + active_or_has_flags => $self->bug_id }; $self->{'flag_types'} = Bugzilla::Flag->_flag_types($vars); return $self->{'flag_types'}; diff --git a/Bugzilla/FlagType.pm b/Bugzilla/FlagType.pm index ea81dfe46..b17e2771e 100644 --- a/Bugzilla/FlagType.pm +++ b/Bugzilla/FlagType.pm @@ -601,7 +601,7 @@ sub match { $tables = join(' ', @$tables); $criteria = join(' AND ', @criteria); - my $flagtype_ids = $dbh->selectcol_arrayref("SELECT id FROM $tables WHERE $criteria"); + my $flagtype_ids = $dbh->selectcol_arrayref("SELECT flagtypes.id FROM $tables WHERE $criteria"); return Bugzilla::FlagType->new_from_list($flagtype_ids); } @@ -679,6 +679,11 @@ sub sqlify_criteria { my $is_active = $criteria->{is_active} ? "1" : "0"; push(@criteria, "flagtypes.is_active = $is_active"); } + if (exists($criteria->{active_or_has_flags}) && $criteria->{active_or_has_flags} =~ /^\d+$/) { + push(@$tables, "LEFT JOIN flags AS f ON flagtypes.id = f.type_id " . + "AND f.bug_id = " . $criteria->{active_or_has_flags}); + push(@criteria, "(flagtypes.is_active = 1 OR f.id IS NOT NULL)"); + } if ($criteria->{product_id}) { my $product_id = $criteria->{product_id}; |