From a6e09913b725b0b1276c2d2a564a7e3070c2c23b Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Tue, 20 Jul 2021 21:39:17 +0000 Subject: [PATCH] Link from assignee to group page (#12795). git-svn-id: http://svn.redmine.org/redmine/trunk@21075 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/application_helper.rb | 4 ++-- app/views/issues/show.html.erb | 2 +- test/functional/issues_controller_test.rb | 11 ++++++++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index be3f40a94..0db895441 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -265,8 +265,8 @@ module ApplicationHelper object.to_s when 'Float' sprintf "%.2f", object - when 'User' - html ? link_to_user(object) : object.to_s + when 'User', 'Group' + html ? link_to_principal(object) : object.to_s when 'Project' html ? link_to_project(object) : object.to_s when 'Version' diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 3a4e1b40f..6b84bdfb3 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -50,7 +50,7 @@ rows.left l(:field_priority), @issue.priority.name, :class => 'priority' unless @issue.disabled_core_fields.include?('assigned_to_id') - rows.left l(:field_assigned_to), (@issue.assigned_to ? link_to_user(@issue.assigned_to) : "-"), :class => 'assigned-to' + rows.left l(:field_assigned_to), (@issue.assigned_to ? link_to_principal(@issue.assigned_to) : "-"), :class => 'assigned-to' end unless @issue.disabled_core_fields.include?('category_id') || (@issue.category.nil? && @issue.project.issue_categories.none?) rows.left l(:field_category), (@issue.category ? @issue.category.name : "-"), :class => 'category' diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 87a6ec704..b8e185a28 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -2605,7 +2605,7 @@ class IssuesControllerTest < Redmine::ControllerTest assert_select 'table.attributes .category', 0 end - def test_show_should_display_link_to_the_assignee + def test_show_should_display_link_to_the_assigned_user get(:show, :params => {:id => 2}) assert_response :success assert_select '.assigned-to' do @@ -2613,6 +2613,15 @@ class IssuesControllerTest < Redmine::ControllerTest end end + def test_show_should_display_link_to_the_assigned_group + Issue.find(2).update_attribute(:assigned_to_id, 10) + get(:show, :params => {:id => 2}) + assert_response :success + assert_select '.assigned-to' do + assert_select 'a[href="/groups/10"]' + end + end + def test_show_should_display_visible_changesets_from_other_projects project = Project.find(2) issue = project.issues.first -- 2.39.5