diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index a1734682e15..4127e29773c 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -535,6 +535,17 @@ header .search_forms, } } +/* Rules for the issues page */ + +body.issues.issues-index { + table td.reporter_users { + max-width: 50px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } +} + /* Rules for search sidebar */ #sidebar .search_results_entry { diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 523f90846a1..dbb6bbc2b0f 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -50,6 +50,7 @@ <%= t ".reports" %> <%= t ".reported_item" %> <%= t ".reported_user" %> + <%= t ".reporter_users" %> <%= t ".last_updated" %> @@ -60,6 +61,10 @@ <%= link_to t(".reports_count", :count => issue.reports_count), issue %> <%= link_to reportable_title(issue.reportable), reportable_url(issue.reportable) %> <%= link_to issue.reported_user.display_name, issue.reported_user if issue.reported_user %> + <% unique_reporters = issue.reports.preload(:user).map(&:user).uniq %> + "> + <%= safe_join(unique_reporters.map { |u| link_to u.display_name, u }, ", ") %> + <% if issue.user_updated %> <%= t ".last_updated_time_ago_user_html", :user => link_to(issue.user_updated.display_name, issue.user_updated), diff --git a/config/locales/en.yml b/config/locales/en.yml index 0278bb8f2fc..80a335df692 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1462,6 +1462,7 @@ en: select_type: Select Type select_last_updated_by: Select Last Updated By reported_user: Reported User + reporter_users: Reporter Users not_updated: Not Updated search: Search search_guidance: "Search Issues:" diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb index b9b989c0751..8556326ae18 100644 --- a/test/system/issues_test.rb +++ b/test/system/issues_test.rb @@ -24,10 +24,12 @@ def test_view_no_issues def test_view_issues sign_in_as(create(:moderator_user)) - issues = create_list(:issue, 3, :assigned_role => "moderator") + issue = create(:issue, :assigned_role => "moderator") + issue.reports << create(:report, :user => create(:user, :display_name => "Test Name")) visit issues_path - assert_content issues.first.reported_user.display_name + assert_content issue.reported_user.display_name + assert_content issue.reports.first.user.display_name end def test_view_issue_with_report