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

Show "reporting user" on "issues" screen #4990

Merged
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
8 changes: 8 additions & 0 deletions app/assets/stylesheets/common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,14 @@ tr.turn {
}
}

/* Rules for the issues page */

.issues.issues-index {
td.reporter_users {
max-width: 5rem;
}
}

/* Rules for the account confirmation page */

.accounts-terms-show {
Expand Down
9 changes: 9 additions & 0 deletions app/controllers/issues_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,15 @@ def index
end

@issues, @newer_issues_id, @older_issues_id = get_page_items(@issues, :limit => @params[:limit])

@unique_reporters = @issues.each_with_object({}) do |issue, reporters|
user_ids = issue.reports.order(:created_at => :desc).map(&:user_id).uniq
reporters[issue.id] = {
:count => user_ids.size,
:users => User.in_order_of(:id, user_ids.first(3))
}
end

render :partial => "page" if turbo_frame_request_id == "pagination"
end

Expand Down
9 changes: 9 additions & 0 deletions app/views/issues/_page.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<th><%= t ".reports" %></th>
<th><%= t ".reported_item" %></th>
<th><%= t ".reported_user" %></th>
<th class="reporter_users"><%= t ".reporter_users" %></th>
<th><%= t ".last_updated" %></th>
</tr>
</thead>
Expand All @@ -23,6 +24,14 @@
<td class="text-nowrap"><%= link_to t(".reports_count", :count => issue.reports_count), issue %></td>
<td><%= link_to reportable_title(issue.reportable), reportable_url(issue.reportable) %></td>
<td><%= link_to issue.reported_user.display_name, issue.reported_user if issue.reported_user %></td>
<td class="reporter_users text-truncate">
<% @unique_reporters[issue.id][:users].each do |reporter| %>
<%= link_to reporter.display_name, reporter, :class => "d-block text-truncate", :title => reporter.display_name %>
<% end %>
<% if @unique_reporters[issue.id][:count] > 3 %>
<p class="m-0"><%= t ".more_reporters", :count => @unique_reporters[issue.id][:count] - 3 %></p>
<% end %>
</td>
<td>
<% if issue.user_updated %>
<%= t ".last_updated_time_ago_user_html", :user => link_to(issue.user_updated.display_name, issue.user_updated),
Expand Down
2 changes: 2 additions & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1509,9 +1509,11 @@ en:
reports: Reports
last_updated: Last Updated
last_updated_time_ago_user_html: "%{time_ago} by %{user}"
reporter_users: Reporter Users
reports_count:
one: "%{count} Report"
other: "%{count} Reports"
more_reporters: "and %{count} more"
reported_item: Reported Item
states:
ignored: Ignored
Expand Down
44 changes: 44 additions & 0 deletions test/system/issues_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -204,4 +204,48 @@ def test_issues_pagination
assert_no_content(/extra_#{n}[^\d]/i)
end
end

def test_single_issue_reporters
sign_in_as(create(:moderator_user))
issue = create(:issue, :assigned_role => "moderator")
issue.reports << create(:report, :user => create(:user, :display_name => "Test Name"))

visit issues_path
assert_content issue.reported_user.display_name
assert_content issue.reports.first.user.display_name
end

def test_multiple_issue_reporters
sign_in_as(create(:moderator_user))
issue = create(:issue, :assigned_role => "moderator")

create_list(:report, 5, :issue => issue)

visit issues_path
0.upto(1).each do |n|
assert_no_content issue.reports[n].user.display_name
end
2.upto(4).each do |n|
assert_content issue.reports[n].user.display_name
end
end

def test_ordering_issue_reporters
sign_in_as(create(:moderator_user))
issue = create(:issue, :assigned_role => "moderator")

create_list(:report, 5, :issue => issue)

4.downto(0).each do |n|
issue.reports << create(:report, :user => issue.reports[n].user)
end

visit issues_path
0.upto(2).each do |n|
assert_content issue.reports[n].user.display_name
end
3.upto(4).each do |n|
assert_no_content issue.reports[n].user.display_name
end
end
end