Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 1517996 - Add a link back to the user's profile from the Activity Report page #1523

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions extensions/BMO/lib/Reports/UserActivity.pm
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,8 @@ sub report {
$vars->{'incomplete_data'} = $incomplete_data;
$vars->{'operations'} = \@operations;

$vars->{user} = Bugzilla::User->new({ name => $input->{who}, cached => 1 });
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is inside the for loop that stores each activity item. So depending on how many activity rows there are, it will be set each time. Also user_activity.html allows for displaying more than one person grouped together. Normally from user_profile.html, the link to user_activity.html would only be a single person so wouldn't be an issue with that case. But we need to be able to handle both cases.

So out side of the for loop you need to create $var->{users}:

$var->{users}
  = [ map { Bugzilla::User->new({ name => $_, cache => 1}) } @who ];


my @bug_ids = sort { $a <=> $b } keys %bug_ids;
$vars->{'bug_ids'} = \@bug_ids;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@
</p>
[% END %]

<p>
<a href="[% basepath FILTER none %]user_profile?user_id=[% user.id FILTER uri %]"> User Profile</a>
</p>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to deal with the possibility that multiple users were searched on instead of always coming from user_profile.html so we may need a loop here:

<p>
  User Profiles:
  [% FOREACH u = users %]
    <a href="[% basepath FILTER none %]user_profile?user_id=[% u.id FILTER uri %]">[% user.name FILTER html %]</a>[% ", " IF NOT loop.last() %]
  [% END %]
</p>


[% IF operations.size > 0 %]
<br>
<table id="report" class="standard">
Expand Down