From 1a23ad80738aae9eae58f9ecfbab9f52bd6c74a7 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Mon, 27 May 2019 17:10:34 -0700 Subject: [PATCH] only include users which have bugs --- Debbugs/Bug/Tag.pm | 3 ++- Debbugs/User.pm | 5 +++++ cgi/pkgreport.cgi | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Debbugs/Bug/Tag.pm b/Debbugs/Bug/Tag.pm index b4284e7..06dfb3f 100644 --- a/Debbugs/Bug/Tag.pm +++ b/Debbugs/Bug/Tag.pm @@ -109,8 +109,9 @@ sub _build_usertags { my $self = shift; local $_; my $t = {}; + my $id = $self->bug->id; for my $user (@{$self->users}) { - for my $tag ($user->tags_on_bug($self->bug->id)) { + for my $tag ($user->tags_on_bug($id)) { $t->{$tag} = $user->email; } } diff --git a/Debbugs/User.pm b/Debbugs/User.pm index 3c4cf6a..50a0965 100644 --- a/Debbugs/User.pm +++ b/Debbugs/User.pm @@ -257,6 +257,11 @@ sub tags_on_bug { return map {@{$self->{"bug_tags"}{$_}//[]}} @_; } +sub has_bug_tags { + my $self = shift; + return keys %{$self->{bug_tags}} > 0; +} + sub write { my $self = shift; diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi index 2c461c9..f1d6cec 100755 --- a/cgi/pkgreport.cgi +++ b/cgi/pkgreport.cgi @@ -474,7 +474,9 @@ my %bugs; my $bugs = Debbugs::Collection::Bug-> new(bugs => \@bugs, @schema_arg, - users => [map {Debbugs::User->new($_)} @users], + users => [map {my $u = Debbugs::User->new($_); + $u->has_bug_tags()?($u):() + } @users], ); $bugs->load_related_packages_and_versions(); -- 2.39.2